void Layout::remove_track(Track &t)
{
- if(tracks.count(&t))
- {
- tracks.erase(&t);
+ if(tracks.erase(&t))
signal_track_removed.emit(t);
+}
+
+void Layout::add_route(Route &r)
+{
+ if(routes.insert(&r).second)
+ signal_route_added.emit(r);
+}
+
+Route &Layout::get_route(const string &name) const
+{
+ for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i)
+ if((*i)->get_name()==name)
+ return **i;
+ throw KeyError("Unknown route", name);
+}
+
+void Layout::remove_route(Route &r)
+{
+ if(routes.erase(&r))
+ signal_route_removed.emit(r);
+}
+
+void Layout::save(const string &fn)
+{
+ IO::BufferedFile out(fn, IO::M_WRITE);
+ DataFile::Writer writer(out);
+
+ if(!base.empty())
+ writer.write((DataFile::Statement("base"), base));
+
+ for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+ {
+ DataFile::Statement st("track");
+ st.append((*i)->get_type().get_article_number());
+ (*i)->save(st.sub);
+ writer.write(st);
+ }
+
+ for(set<Route *>::iterator i=routes.begin(); i!=routes.end(); ++i)
+ {
+ DataFile::Statement st("route");
+ st.append((*i)->get_name());
+ (*i)->save(st.sub);
+ writer.write(st);
}
}
for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
(*i)->break_links();
- set<Track *> flext;
+ list<Track *> flext;
for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
{
if((*i)->get_flex())
- flext.insert(*i);
+ flext.push_back(*i);
else
{
for(set<Track *>::iterator j=i; j!=tracks.end(); ++j)
}
}
- for(set<Track *>::iterator i=flext.begin(); i!=flext.end(); ++i)
+ for(list<Track *>::iterator i=flext.begin(); i!=flext.end(); ++i)
for(set<Track *>::iterator j=tracks.begin(); j!=tracks.end(); ++j)
- if(j!=i)
+ if(*j!=*i)
(*i)->snap_to(**j, true);
}
-void Layout::save(const string &fn)
+void Layout::check_routes()
{
- IO::BufferedFile out(fn, IO::M_WRITE);
- DataFile::Writer writer(out);
- if(!base.empty())
- writer.write((DataFile::Statement("base"), base));
- for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+ for(set<Route *>::iterator i=routes.begin(); i!=routes.end(); ++i)
{
- DataFile::Statement st("track");
- st.append((*i)->get_type().get_article_number());
- (*i)->save(st.sub);
- writer.write(st);
+ // We must copy the turnout map, since adding tracks to the route will (temporarily) mess it up
+ const map<unsigned, int> turnouts = (*i)->get_turnouts();
+
+ Track *track = 0;
+ unsigned trk_path = 0;
+ for(set<Track *>::const_iterator j=tracks.begin(); j!=tracks.end(); ++j)
+ {
+ map<unsigned, int>::const_iterator k = turnouts.find((*j)->get_turnout_id());
+ if(k!=turnouts.end())
+ {
+ track = *j;
+ trk_path = k->second;
+ break;
+ }
+ }
+
+ if(!track)
+ continue;
+
+ (*i)->add_track(*track);
+
+ const vector<Endpoint> &eps = track->get_type().get_endpoints();
+ unsigned ep = 0;
+ for(unsigned j=0; j<eps.size(); ++i)
+ if(eps[j].paths&(1<<trk_path))
+ {
+ ep = j;
+ break;
+ }
+
+ Track *start = track;
+ while(1)
+ {
+ unsigned out_ep = track->traverse(ep, trk_path);
+ Track *next = track->get_links()[out_ep];
+ if(!next || next == start)
+ break;
+ ep = next->get_endpoint_by_link(*track);
+ if(next->get_type().get_n_paths()>1)
+ {
+ map<unsigned, int>::const_iterator j = turnouts.find(next->get_turnout_id());
+ if(j==turnouts.end())
+ break;
+ trk_path = j->second;
+ }
+ else
+ trk_path = 0;
+ (*i)->add_track(*next);
+ track = next;
+ }
}
}
DataFile::BasicLoader<Layout>(l)
{
add("base", &Layout::base);
+ add("route", &Loader::route);
add("track", &Loader::track);
}
void Layout::Loader::finish()
{
obj.check_links();
+ obj.check_routes();
for(set<Track *>::iterator i=obj.tracks.begin(); i!=obj.tracks.end(); ++i)
(*i)->check_slope();
}
+void Layout::Loader::route(const string &n)
+{
+ RefPtr<Route> rte = new Route(obj, n);
+ load_sub(*rte);
+ obj.add_route(*rte.release());
+}
+
void Layout::Loader::track(unsigned art_nr)
{
- TrackType &type=obj.catalogue.get_track(art_nr);
+ TrackType &type = obj.catalogue.get_track(art_nr);
- RefPtr<Track> trk=new Track(type);
+ RefPtr<Track> trk = new Track(type);
load_sub(*trk);
obj.add_track(*trk.release());
}