Generate IDs for new turnouts

[r2c2.git] / source / libmarklin / route.cpp

diff --git a/source/libmarklin/route.cpp b/source/libmarklin/route.cpp
index 7ecd473694926ea306067f1993e03ad16b08a0cf..cdbcf1dc4c8cc778f4183277dae9c6b65616f572 100644 (file)
--- a/source/libmarklin/route.cpp
+++ b/source/libmarklin/route.cpp
@@ -213,17 +213,44 @@ void Route::add_tracks(const set<const Track *> &trks)
        update_turnouts();
 }
 
-void Route::save(list<DataFile::Statement> &st) const
+void Route::add_track_chain(const Track &start, unsigned ep, const TurnoutMap &trnts)
 {
-       for(map<unsigned, int>::const_iterator i=turnouts.begin(); i!=turnouts.end(); ++i)
-               st.push_back((DataFile::Statement("turnout"), i->first, i->second));
+       const Track *track = &start;
+       while(1)
+       {
+               if(track->get_type().is_dead_end())
+                       break;
+
+               if(tracks.count(track))
+                       break;
+
+               int path = 0;
+               if(track->get_turnout_id())
+               {
+                       TurnoutMap::const_iterator i = trnts.find(track->get_turnout_id());
+                       if(i==trnts.end())
+                               break;
+
+                       path = i->second;
+               }
+
+               add_track(*track);
+
+               unsigned out_ep = track->traverse(ep, path);
+               Track *next = track->get_links()[out_ep];
+               if(!next)
+                       break;
+
+               ep = next->get_endpoint_by_link(*track);
+               track = next;
+       }
 }
 
 void Route::update_turnouts()
 {
        set<unsigned> found;
        for(set<const Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
-               if(unsigned tid=(*i)->get_turnout_id())
+               if(unsigned tid = (*i)->get_turnout_id())
                {
                        found.insert(tid);
 
@@ -237,7 +264,7 @@ void Route::update_turnouts()
                                if(!tracks.count(links[j]))
                                        continue;
 
-                               if(unsigned tid2=links[j]->get_turnout_id())
+                               if(unsigned tid2 = links[j]->get_turnout_id())
                                {
                                        const Endpoint &ep = links[j]->get_type().get_endpoints()[links[j]->get_endpoint_by_link(**i)];
                                        int p = get_turnout(tid2);
@@ -273,6 +300,12 @@ void Route::update_turnouts()
        }
 }
 
+void Route::save(list<DataFile::Statement> &st) const
+{
+       for(map<unsigned, int>::const_iterator i=turnouts.begin(); i!=turnouts.end(); ++i)
+               st.push_back((DataFile::Statement("turnout"), i->first, i->second));
+}
+
 unsigned Route::check_validity(const Track &trk) const
 {
        unsigned result = 4;
@@ -347,9 +380,37 @@ Route::Loader::Loader(Route &r):
        add("turnout", &Loader::turnout);
 }
 
+void Route::Loader::finish()
+{
+       const set<Track *> &ltracks = obj.layout.get_tracks();
+       for(set<Track *>::const_iterator i=ltracks.begin(); i!=ltracks.end(); ++i)
+       {
+               unsigned tid = (*i)->get_turnout_id();
+               if(!tid)
+                       continue;
+
+               TurnoutMap::iterator j = turnouts.find(tid);
+               if(j==turnouts.end())
+                       continue;
+
+               unsigned path_mask = 1<<j->second;
+               const vector<Endpoint> &eps = (*i)->get_type().get_endpoints();
+               for(unsigned k=0; k<eps.size(); ++k)
+                       if(eps[k].paths&path_mask)
+                       {
+                               Track *link = (*i)->get_link(k);
+                               if(!obj.tracks.count(link))
+                                       obj.add_track_chain(*link, link->get_endpoint_by_link(**i), turnouts);
+                               if(!obj.tracks.count(*i))
+                                       obj.add_track_chain(**i, k, turnouts);
+                               break;
+                       }
+       }
+}
+
 void Route::Loader::turnout(unsigned id, unsigned path)
 {
-       obj.turnouts[id] = path;
+       turnouts[id] = path;
 }
 
 } // namespace Marklin