X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrack.cpp;h=f1fdd992822180c26ddd5c39a6095bb8145516e4;hb=93c148ff88ba2c8266b44c336ba7ddd948010de7;hp=44d992ba07290bef90ded2471b99c36c029db89c;hpb=b28062f2dc88e082ee5a28b2e1f7c4c8bd989023;p=r2c2.git

diff --git a/source/libr2c2/track.cpp b/source/libr2c2/track.cpp
index 44d992b..f1fdd99 100644
--- a/source/libr2c2/track.cpp
+++ b/source/libr2c2/track.cpp
@@ -1,5 +1,6 @@
 #include <cmath>
 #include <msp/core/maputils.h>
+#include <msp/strings/format.h>
 #include "block.h"
 #include "catalogue.h"
 #include "driver.h"
@@ -46,8 +47,9 @@ Track::Track(Layout &l, const TrackType &t):
 		if(layout.has_driver())
 		{
 			Driver &driver = layout.get_driver();
-			driver.add_turnout(turnout_addr, type);
+			turnout_id = driver.add_turnout(turnout_addr, type);
 			driver.signal_turnout.connect(sigc::mem_fun(this, &Track::turnout_event));
+			driver.signal_turnout_failed.connect(sigc::mem_fun(this, &Track::turnout_failed));
 		}
 	}
 
@@ -60,8 +62,8 @@ Track::Track(Layout &l, const TrackType &t):
 Track::~Track()
 {
 	break_links();
-	if(layout.has_driver() && turnout_addr)
-		layout.get_driver().remove_turnout(turnout_addr);
+	if(layout.has_driver() && turnout_id)
+		layout.get_driver().remove_turnout(turnout_id);
 	layout.remove(*this);
 }
 
@@ -166,13 +168,15 @@ void Track::set_turnout_address(unsigned a)
 
 	Driver *driver = (layout.has_driver() ? &layout.get_driver() : 0);
 
-	if(driver && turnout_addr)
-		driver->remove_turnout(turnout_addr);
+	if(driver && turnout_id)
+		driver->remove_turnout(turnout_id);
 	turnout_addr = a;
 	layout.create_blocks(*this);
 	layout.update_routes();
 	if(driver && turnout_addr)
-		driver->add_turnout(turnout_addr, type);
+		turnout_id = driver->add_turnout(turnout_addr, type);
+	else
+		turnout_id = 0;
 }
 
 void Track::set_sensor_address(unsigned a)
@@ -186,14 +190,17 @@ void Track::set_sensor_address(unsigned a)
 
 void Track::set_active_path(unsigned p)
 {
-	if(!turnout_addr)
+	if(!type.is_turnout())
 		throw logic_error("not a turnout");
 	if(!(type.get_paths()&(1<<p)))
 		throw invalid_argument("Track::set_active_path");
 
+	if(active_path==p)
+		return;
+
 	signal_path_changing(p);
 	path_changing = true;
-	layout.get_driver().set_turnout(turnout_addr, p);
+	layout.get_driver().set_turnout(turnout_id, p);
 }
 
 float Track::get_path_length(int p) const
@@ -313,7 +320,11 @@ bool Track::link_to(Object &other)
 	if(!otrack)
 		return false;
 
-	float limit = layout.get_catalogue().get_gauge();
+	float gauge_ratio = otrack->get_type().get_gauge()/type.get_gauge();
+	if(gauge_ratio<0.99 || gauge_ratio>1.01)
+		return false;
+
+	float limit = type.get_gauge();
 	if(!flex && !otrack->get_flex())
 		limit /= 10;
 	limit *= limit;
@@ -406,9 +417,9 @@ void Track::save(list<DataFile::Statement> &st) const
 		st.push_back((DataFile::Statement("flex"), true));
 }
 
-void Track::turnout_event(unsigned addr, unsigned state)
+void Track::turnout_event(unsigned id, unsigned state)
 {
-	if(addr==turnout_addr)
+	if(id==turnout_id)
 	{
 		active_path = state;
 		path_changing = false;
@@ -416,6 +427,15 @@ void Track::turnout_event(unsigned addr, unsigned state)
 	}
 }
 
+void Track::turnout_failed(unsigned id)
+{
+	if(id==turnout_id)
+	{
+		path_changing = false;
+		layout.emergency(block, "Turnout failed");
+	}
+}
+
 
 Track::Loader::Loader(Track &t):
 	DataFile::ObjectLoader<Track>(t)