X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Flibmarklin%2Flayout.cpp;h=4e6620b2e1bcbb6704446efef85aabf5015c3b90;hb=02c9a9779954d993cb73fe5f7a72b0847e87f633;hp=50eba62ab6f096b04427c3feb09e093b7858f3ef;hpb=3df8cb5c78fbb0b919bcb79677c6c788b8028482;p=r2c2.git

diff --git a/source/libmarklin/layout.cpp b/source/libmarklin/layout.cpp
index 50eba62..4e6620b 100644
--- a/source/libmarklin/layout.cpp
+++ b/source/libmarklin/layout.cpp
@@ -25,6 +25,8 @@ Layout::~Layout()
 {
 	for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
 		delete *i;
+	for(map<string, Route *>::iterator i=routes.begin(); i!=routes.end(); ++i)
+		delete i->second;
 }
 
 void Layout::add_track(Track &t)
@@ -35,43 +37,40 @@ void Layout::add_track(Track &t)
 
 void Layout::remove_track(Track &t)
 {
-	if(tracks.count(&t))
-	{
-		tracks.erase(&t);
+	if(tracks.erase(&t))
 		signal_track_removed.emit(t);
-	}
 }
 
-void Layout::check_links()
+void Layout::add_route(Route &r)
 {
-	for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-		(*i)->break_links();
+	if(routes.count(r.get_name()))
+		throw KeyError("Duplicate route name");
+	routes[r.get_name()] = &r;
+	signal_route_added.emit(r);
+}
 
-	set<Track *> flext;
-	for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-	{
-		if((*i)->get_flex())
-			flext.insert(*i);
-		else
-		{
-			for(set<Track *>::iterator j=i; j!=tracks.end(); ++j)
-				if(j!=i)
-					(*i)->snap_to(**j, true);
-		}
-	}
+Route &Layout::get_route(const string &name) const
+{
+	map<string, Route *>::const_iterator i = routes.find(name);
+	if(i==routes.end())
+		throw KeyError("Unknown route", name);
+	return *i->second;
+}
 
-	for(set<Track *>::iterator i=flext.begin(); i!=flext.end(); ++i)
-		for(set<Track *>::iterator j=tracks.begin(); j!=tracks.end(); ++j)
-			if(j!=i)
-				(*i)->snap_to(**j, true);
+void Layout::remove_route(Route &r)
+{
+	if(routes.erase(r.get_name()))
+		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");
@@ -79,36 +78,109 @@ void Layout::save(const string &fn)
 		(*i)->save(st.sub);
 		writer.write(st);
 	}
-	/*ofstream out(fn.c_str());
-	if(!out) return -1;
 
-	filename=fn;
+	for(map<string, Route *>::iterator i=routes.begin(); i!=routes.end(); ++i)
+	{
+		DataFile::Statement st("route");
+		st.append(i->first);
+		i->second->save(st.sub);
+		writer.write(st);
+	}
+}
 
-	if(!base.empty())
-		out<<"base \""<<base<<"\";\n";
+void Layout::check_links()
+{
 	for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-	{
-		out<<"track "<<(*i)->get_type().get_article_number()<<"\n{\n";
-		const Point &p=(*i)->get_position();
-		out<<"\tposition "<<p.x<<' '<<p.y<<' '<<p.z<<";\n";
-		out<<"\trotation "<<(*i)->get_rotation()<<";\n";
-		out<<"\tslope "<<(*i)->get_slope()<<";\n";
+		(*i)->break_links();
 
-		unsigned id=(*i)->get_turnout_id();
-		if(id)
-			out<<"\tturnout_id "<<id<<";\n";
+	list<Track *> flext;
+	for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+	{
+		if((*i)->get_flex())
+			flext.push_back(*i);
+		else
+		{
+			for(set<Track *>::iterator j=i; j!=tracks.end(); ++j)
+				if(j!=i)
+					(*i)->snap_to(**j, true);
+		}
+	}
 
-		id=(*i)->get_sensor_id();
-		if(id)
-			out<<"\tsensor_id "<<id<<";\n";
+	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)
+				(*i)->snap_to(**j, true);
+}
 
-		if((*i)->get_flex())
-			out<<"\tflex true;\n";
+void Layout::check_routes()
+{
+	for(map<string, Route *>::iterator i=routes.begin(); i!=routes.end(); ++i)
+	{
+		/* We must copy the turnout map, since adding tracks to the route will
+		(temporarily) mess it up */
+		const map<unsigned, int> turnouts = i->second->get_turnouts();
+
+		// Find any turnout in the route
+		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;
+			}
+		}
 
-		out<<"};\n";
+		if(!track)
+			continue;
+
+		// Find an applicable endpoint
+		const vector<Endpoint> &eps = track->get_type().get_endpoints();
+		unsigned ep = 0;
+		for(unsigned j=0; j<eps.size(); ++j)
+			if(eps[j].paths&(1<<trk_path))
+			{
+				ep = j;
+				break;
+			}
+
+		Track *start = 0;
+		while(1)
+		{
+			// Traverse the track and get the next one
+			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)
+			{
+				// Select correct path across the turnout, or break if we hit an unknown turnout
+				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;
+
+				/* Start adding tracks when we find the first non-turnout.  This
+				prevents the occurrence of ambiguities while adding the tracks */
+				if(!start)
+					start = next;
+			}
+
+			if(start)
+				i->second->add_track(*next);
+
+			track = next;
+		}
 	}
-
-	return 0;*/
 }
 
 
@@ -116,22 +188,31 @@ Layout::Loader::Loader(Layout &l):
 	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());
 }