X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrack.cpp;h=d7ccf667673d16dc99b969a36f35798cfd6177cb;hb=66a30fdf63df6ae092fb3d335c30a37e4e6ef40d;hp=43bacc3d8bc10f6a4653716064cbffb331e2ed0c;hpb=f23c8d8cbc4e72b45e3a719b2cf974ce35d054e9;p=r2c2.git

diff --git a/source/libr2c2/track.cpp b/source/libr2c2/track.cpp
index 43bacc3..d7ccf66 100644
--- a/source/libr2c2/track.cpp
+++ b/source/libr2c2/track.cpp
@@ -1,14 +1,31 @@
 #include <cmath>
+#include <msp/core/maputils.h>
+#include <msp/strings/format.h>
 #include "block.h"
 #include "catalogue.h"
 #include "driver.h"
 #include "layout.h"
 #include "track.h"
+#include "trackattachment.h"
 #include "tracktype.h"
 
 using namespace std;
 using namespace Msp;
 
+namespace {
+
+struct AttachmentCompare
+{
+	unsigned entry;
+
+	AttachmentCompare(unsigned e): entry(e) { }
+
+	bool operator()(const R2C2::TrackAttachment *a1, const R2C2::TrackAttachment *a2) const
+	{ return a1->get_offset_from_endpoint(entry)<a2->get_offset_from_endpoint(entry); }
+};
+
+}
+
 namespace R2C2 {
 
 Track::Track(Layout &l, const TrackType &t):
@@ -17,19 +34,27 @@ Track::Track(Layout &l, const TrackType &t):
 	block(0),
 	slope(0),
 	flex(false),
-	turnout_id(0),
-	sensor_id(0),
+	turnout_addr(0),
+	sensor_addr(0),
 	links(type.get_endpoints().size()),
 	active_path(0),
-	path_changing(false)
+	path_changing(false),
+	preferred_exit(-1)
 {
 	if(type.is_turnout())
-		turnout_id = layout.allocate_turnout_id();
+	{
+		turnout_addr = layout.allocate_turnout_address();
 
-	layout.add(*this);
+		if(layout.has_driver())
+		{
+			Driver &driver = layout.get_driver();
+			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));
+		}
+	}
 
-	if(layout.has_driver())
-		layout.get_driver().signal_turnout.connect(sigc::mem_fun(this, &Track::turnout_event));
+	layout.add(*this);
 
 	for(unsigned paths = type.get_paths(); !(paths&1); ++active_path, paths>>=1) ;
 }
@@ -37,6 +62,8 @@ Track::Track(Layout &l, const TrackType &t):
 Track::~Track()
 {
 	break_links();
+	if(layout.has_driver() && turnout_id)
+		layout.get_driver().remove_turnout(turnout_id);
 	layout.remove(*this);
 }
 
@@ -132,68 +159,87 @@ void Track::check_slope()
 	signal_moved.emit();
 }
 
-void Track::set_turnout_id(unsigned i)
+void Track::set_turnout_address(unsigned a)
 {
 	if(!type.is_turnout())
 		throw logic_error("not a turnout");
-	if(!i)
+	if(!a)
 		throw invalid_argument("Track::set_turnout_id");
 
-	turnout_id = i;
+	Driver *driver = (layout.has_driver() ? &layout.get_driver() : 0);
+
+	if(driver && turnout_id)
+		driver->remove_turnout(turnout_id);
+	turnout_addr = a;
 	layout.create_blocks(*this);
 	layout.update_routes();
-	if(layout.has_driver() && turnout_id)
-		layout.get_driver().add_turnout(turnout_id, type);
+	if(driver && turnout_addr)
+		turnout_id = driver->add_turnout(turnout_addr, type);
+	else
+		turnout_id = 0;
 }
 
-void Track::set_sensor_id(unsigned i)
+void Track::set_sensor_address(unsigned a)
 {
 	if(type.is_turnout())
 		throw logic_error("is a turnout");
 
-	sensor_id = i;
+	sensor_addr = a;
 	layout.create_blocks(*this);
-	if(layout.has_driver() && sensor_id)
-		layout.get_driver().add_sensor(sensor_id);
+}
+
+void Track::set_preferred_exit(int e)
+{
+	preferred_exit = e;
 }
 
 void Track::set_active_path(unsigned p)
 {
-	if(!turnout_id)
+	if(!type.is_turnout())
 		throw logic_error("not a turnout");
 	if(!(type.get_paths()&(1<<p)))
 		throw invalid_argument("Track::set_active_path");
 
-	signal_path_changing(p);
+	if(active_path==p)
+		return;
+
+	signal_path_changing.emit(p);
 	path_changing = true;
 	layout.get_driver().set_turnout(turnout_id, p);
 }
 
-TrackPoint Track::get_point(unsigned epi, unsigned path, float d) const
+float Track::get_path_length(int p) const
 {
-	TrackPoint p = type.get_point(epi, path, d);
+	if(p<0)
+		p = active_path;
+	return type.get_path_length(p);
+}
 
-	p.pos = position+rotated_vector(p.pos, rotation);
-	p.dir += rotation;
+OrientedPoint Track::get_point(unsigned epi, unsigned path, float d) const
+{
+	OrientedPoint p = type.get_point(epi, path, d);
+
+	p.position = position+rotated_vector(p.position, rotation);
+	p.rotation += rotation;
 	if(type.get_endpoints().size()==2)
 	{
-		float grade = tan(tilt);
+		float dz = tan(tilt)*d;
 		if(epi==0)
 		{
-			p.pos.z += grade*d;
-			p.grade = grade;
+			p.position.z += dz;
+			p.tilt = tilt;
 		}
 		else
 		{
-			p.pos.z += slope-grade*d;
-			p.grade = -grade;
+			p.position.z += slope-dz;
+			p.tilt = -tilt;
 		}
 	}
 
 	return p;
 }
 
-TrackPoint Track::get_point(unsigned epi, float d) const
+OrientedPoint Track::get_point(unsigned epi, float d) const
 {
 	return get_point(epi, active_path, d);
 }
@@ -230,12 +276,12 @@ bool Track::snap(Snap &sn, float limit, SnapType what) const
 	{
 		Vector local = rotated_vector(sn.position-position, -rotation);
 
-		TrackPoint tp = type.get_nearest_point(local);
-		Vector span = local-tp.pos;
+		OrientedPoint np = type.get_nearest_point(local);
+		Vector span = local-np.position;
 		if(dot(span, span)<=limit*limit)
 		{
-			sn.position = position+rotated_vector(tp.pos, rotation);
-			sn.rotation = tp.dir+rotation;
+			sn.position = position+rotated_vector(np.position, rotation);
+			sn.rotation = np.rotation+rotation;
 			return true;
 		}
 	}
@@ -279,7 +325,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;
@@ -298,6 +348,7 @@ bool Track::link_to(Object &other)
 			if(dot(span, span)<limit && abs(da).radians()<0.01)
 			{
 				break_link(i);
+				otrack->break_link(j);
 				links[i] = otrack;
 				otrack->links[j] = this;
 				check_slope();
@@ -323,33 +374,63 @@ bool Track::break_link(unsigned i)
 		return false;
 
 	links[i] = 0;
-	other->break_link(*this);
-	// XXX Creates the blocks twice, because the other track calls this too
-	layout.create_blocks(*this);
+	if(!other->break_link(*this))
+	{
+		/* If the call doesn't succeed, it means that the other track already
+		broke the link and is calling us right now.  Recreate blocks in the inner
+		call so it occurs before any signals are emitted. */
+		layout.create_blocks(*this);
+	}
+
 	signal_link_changed.emit(i, 0);
 
 	return true;
 }
 
+void Track::add_attachment(TrackAttachment &a)
+{
+	if(find(attachments.begin(), attachments.end(), &a)!=attachments.end())
+		throw key_error(&a);
+	attachments.push_back(&a);
+}
+
+void Track::remove_attachment(TrackAttachment &a)
+{
+	AttachmentList::iterator i = find(attachments.begin(), attachments.end(), &a);
+	if(i==attachments.end())
+		throw key_error(&a);
+	attachments.erase(i);
+}
+
+Track::AttachmentList Track::get_attachments_ordered(unsigned epi) const
+{
+	AttachmentList result = attachments;
+	result.sort(AttachmentCompare(epi));
+	return result;
+}
+
 void Track::save(list<DataFile::Statement> &st) const
 {
 	st.push_back((DataFile::Statement("position"), position.x, position.y, position.z));
 	st.push_back((DataFile::Statement("rotation"), rotation.radians()));
 	st.push_back((DataFile::Statement("tilt"), tilt.radians()));
-	if(turnout_id)
-		st.push_back((DataFile::Statement("turnout_id"), turnout_id));
-	if(sensor_id)
-		st.push_back((DataFile::Statement("sensor_id"), sensor_id));
+	if(turnout_addr)
+		st.push_back((DataFile::Statement("turnout_address"), turnout_addr));
+	if(sensor_addr)
+		st.push_back((DataFile::Statement("sensor_address"), sensor_addr));
 	if(flex)
 		st.push_back((DataFile::Statement("flex"), true));
 }
 
-void Track::turnout_event(unsigned addr, unsigned state)
+void Track::save_dynamic(list<DataFile::Statement> &st) const
 {
-	if(!turnout_id)
-		return;
+	if(turnout_addr)
+		st.push_back((DataFile::Statement("path"), active_path));
+}
 
-	if(addr==turnout_id)
+void Track::turnout_event(unsigned id, unsigned state)
+{
+	if(id==turnout_id)
 	{
 		active_path = state;
 		path_changing = false;
@@ -357,21 +438,43 @@ 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)
 {
+	add("path",       &Loader::path);
 	add("position",   &Loader::position);
 	add("rotation",   &Loader::rotation);
 	add("tilt",       &Loader::tilt);
-	add("turnout_id", &Loader::turnout_id);
-	add("sensor_id",  &Loader::sensor_id);
+	add("turnout_id", &Loader::turnout_address);
+	add("turnout_address", &Loader::turnout_address);
+	add("sensor_id",  &Loader::sensor_address);
+	add("sensor_address",  &Loader::sensor_address);
 	add("flex",       &Track::flex);
 
 	// deprecated
 	add("slope",      &Loader::slope);
 }
 
+void Track::Loader::path(unsigned p)
+{
+	obj.set_active_path(p);
+	if(obj.path_changing)
+	{
+		obj.active_path = p;
+		obj.signal_path_changed.emit(p);
+	}
+}
+
 void Track::Loader::position(float x, float y, float z)
 {
 	obj.set_position(Vector(x, y, z));
@@ -382,9 +485,9 @@ void Track::Loader::rotation(float r)
 	obj.set_rotation(Angle::from_radians(r));
 }
 
-void Track::Loader::sensor_id(unsigned id)
+void Track::Loader::sensor_address(unsigned addr)
 {
-	obj.set_sensor_id(id);
+	obj.set_sensor_address(addr);
 }
 
 void Track::Loader::slope(float s)
@@ -397,9 +500,9 @@ void Track::Loader::tilt(float t)
 	obj.set_tilt(Angle::from_radians(t));
 }
 
-void Track::Loader::turnout_id(unsigned id)
+void Track::Loader::turnout_address(unsigned addr)
 {
-	obj.set_turnout_id(id);
+	obj.set_turnout_address(addr);
 }
 
 } // namespace R2C2