X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Flayout.cpp;h=1df37d3d3ea6b742dfb75e7f893a1d7056426fa0;hb=80dcfa55c913037066e43fa115ae56fa51b974f2;hp=234b923411298cc755fde1c60a318f10eef88806;hpb=444c7efb2fadb10e98197a62b791829d821370c0;p=r2c2.git

diff --git a/source/libmarklin/layout.cpp b/source/libmarklin/layout.cpp
index 234b923..1df37d3 100644
--- a/source/libmarklin/layout.cpp
+++ b/source/libmarklin/layout.cpp
@@ -45,6 +45,14 @@ void Layout::add_route(Route &r)
 		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))
@@ -108,24 +116,27 @@ void Layout::check_routes()
 		const map<unsigned, int> turnouts = (*i)->get_turnouts();
 
 		Track *track = 0;
-		unsigned trk_route = 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_route = k->second;
+				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].routes&(1<<trk_route))
+			if(eps[j].paths&(1<<trk_path))
 			{
 				ep = j;
 				break;
@@ -134,22 +145,20 @@ void Layout::check_routes()
 		Track *start = track;
 		while(1)
 		{
-			int out_ep = track->traverse(ep, trk_route);
-			if(out_ep<0)
-				break;
+			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_routes()>1)
+			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_route = j->second;
+				trk_path = j->second;
 			}
 			else
-				trk_route = 0;
+				trk_path = 0;
 			(*i)->add_track(*next);
 			track = next;
 		}
@@ -176,7 +185,7 @@ void Layout::Loader::finish()
 
 void Layout::Loader::route(const string &n)
 {
-	RefPtr<Route> rte = new Route(n);
+	RefPtr<Route> rte = new Route(obj, n);
 	load_sub(*rte);
 	obj.add_route(*rte.release());
 }