X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrafficmanager.cpp;h=49dda42954d05ccdcb8b58f067899743111c4dbf;hb=dcfa1e9503b7e97b61396d7458f0b2e5896779cd;hp=069731e060ae3a80e741a754fa83519af0b6da59;hpb=38fb8d56efde037a71c46a58bda314655e68ab6c;p=r2c2.git

diff --git a/source/libmarklin/trafficmanager.cpp b/source/libmarklin/trafficmanager.cpp
index 069731e..49dda42 100644
--- a/source/libmarklin/trafficmanager.cpp
+++ b/source/libmarklin/trafficmanager.cpp
@@ -31,9 +31,10 @@ TrafficManager::TrafficManager(Control &c, Layout &l):
 	for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
 	{
 		if(unsigned tid=(*i)->get_turnout_id())
-			new Turnout(control, tid, (*i)->get_type().get_n_routes()>=3);
+			new Turnout(control, tid, (*i)->get_type().get_n_paths()>=3);
 		if(unsigned sid=(*i)->get_sensor_id())
-			new Sensor(control, sid);
+			if(!control.get_sensors().count(sid))
+				new Sensor(control, sid);
 
 		if(used_tracks.count(*i)==0)
 		{
@@ -57,6 +58,15 @@ TrafficManager::~TrafficManager()
 		delete *i;
 }
 
+Block &TrafficManager::get_block(unsigned id) const
+{
+	for(list<Block *>::const_iterator i=blocks.begin(); i!=blocks.end(); ++i)
+		if((*i)->get_id()==id)
+			return **i;
+
+	throw KeyError("Unknown block", lexical_cast(id));
+}
+
 Block &TrafficManager::get_block_by_track(const Track &t) const
 {
 	for(list<Block *>::const_iterator i=blocks.begin(); i!=blocks.end(); ++i)
@@ -69,10 +79,22 @@ Block &TrafficManager::get_block_by_track(const Track &t) const
 	throw InvalidParameterValue("Unknown track");
 }
 
+Train &TrafficManager::get_train_by_locomotive(const Locomotive &loco) const
+{
+	for(list<Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
+		if(&(*i)->get_locomotive()==&loco)
+			return **i;
+
+	throw InvalidParameterValue("Unknown locomotive");
+}
+
 void TrafficManager::add_train(Train *t)
 {
 	if(find(trains.begin(), trains.end(), t)==trains.end())
+	{
 		trains.push_back(t);
+		signal_train_added.emit(*t);
+	}
 }
 
 void TrafficManager::tick()
@@ -102,7 +124,7 @@ void TrafficManager::save(const string &fn) const
 	}
 }
 
-void TrafficManager::turnout_route_changed(unsigned, Turnout *)
+void TrafficManager::turnout_path_changed(unsigned, Turnout *)
 {
 }