X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Froute.cpp;h=5ee30e033161030fa31a8f558f50e7f4a3b9aaea;hb=e8b19bb2711913226580b93ba127b0628839c10d;hp=b3dc474d81d4cbdfeb68bf13d162646cd4262691;hpb=b28062f2dc88e082ee5a28b2e1f7c4c8bd989023;p=r2c2.git

diff --git a/source/libr2c2/route.cpp b/source/libr2c2/route.cpp
index b3dc474..5ee30e0 100644
--- a/source/libr2c2/route.cpp
+++ b/source/libr2c2/route.cpp
@@ -140,12 +140,6 @@ Route::~Route()
 	layout.remove(*this);
 }
 
-void Route::set_name(const string &n)
-{
-	name = n;
-	signal_name_changed.emit(name);
-}
-
 void Route::set_temporary(bool t)
 {
 	temporary = t;
@@ -173,6 +167,9 @@ void Route::update_turnouts()
 
 void Route::update_turnout(Track &track)
 {
+	if(!track.get_type().is_turnout())
+		return;
+
 	// Build a combined path mask from linked endpoints
 	unsigned nls = track.get_n_link_slots();
 	unsigned mask = track.get_type().get_paths();
@@ -218,10 +215,10 @@ int Route::get_turnout(unsigned id) const
 
 unsigned Route::get_path(Track &trk) const
 {
-	if(unsigned taddr = trk.get_turnout_address())
+	if(trk.get_type().is_turnout())
 	{
-		map<unsigned, int>::const_iterator i = turnouts.find(taddr);
-		if(i!=turnouts.end())
+		map<unsigned, int>::const_iterator i = turnouts.find(trk.get_turnout_address());
+		if(i!=turnouts.end() && i->second>=0)
 			return i->second;
 	}
 	return trk.get_active_path();
@@ -260,6 +257,11 @@ void Route::save(list<DataFile::Statement> &st) const
 		st.push_back((DataFile::Statement("turnout"), i->first, i->second));
 }
 
+DataFile::Statement Route::save_reference() const
+{
+	return (DataFile::Statement("route"), name);
+}
+
 Route *Route::find(const TrackIter &from, Track &to)
 {
 	return create_route(from, TrackMatch(to));
@@ -284,7 +286,7 @@ Route *Route::find(const TrackIter &from, const set<Track *> &to)
 Route::Loader::Loader(Route &r):
 	DataFile::ObjectLoader<Route>(r)
 {
-	add("name",    &Route::name);
+	add("name",    &Loader::name);
 	add("turnout", &Loader::turnout);
 }
 
@@ -313,6 +315,11 @@ void Route::Loader::finish()
 	}
 }
 
+void Route::Loader::name(const string &n)
+{
+	obj.name = n;
+}
+
 void Route::Loader::turnout(unsigned id, unsigned path)
 {
 	turnouts[id] = path;