X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrack.cpp;h=5843e22f017953474588c956ca73798fcbf4b4be;hb=651698847d5293cfb15b6fb23a394701388c0151;hp=617328a64b7d24e474b39a50deae8e2f12dbda1b;hpb=6109a2122226e1c71e9cc71e4c21036e99e43601;p=r2c2.git

diff --git a/source/libmarklin/track.cpp b/source/libmarklin/track.cpp
index 617328a..5843e22 100644
--- a/source/libmarklin/track.cpp
+++ b/source/libmarklin/track.cpp
@@ -1,11 +1,13 @@
 /* $Id$
 
 This file is part of the MSP Märklin suite
-Copyright © 2006-2009 Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2010  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
 #include <cmath>
+#include "driver.h"
+#include "layout.h"
 #include "track.h"
 #include "tracktype.h"
 
@@ -14,19 +16,27 @@ using namespace Msp;
 
 namespace Marklin {
 
-Track::Track(const TrackType &t):
+Track::Track(Layout &l, const TrackType &t):
+	layout(l),
 	type(t),
 	rot(0),
 	slope(0),
 	flex(false),
 	turnout_id(0),
 	sensor_id(0),
-	links(t.get_endpoints().size())
-{ }
+	links(t.get_endpoints().size()),
+	active_path(0)
+{
+	layout.add_track(*this);
+
+	if(layout.has_driver())
+		layout.get_driver().signal_turnout.connect(sigc::mem_fun(this, &Track::turnout_event));
+}
 
 Track::~Track()
 {
 	break_links();
+	layout.remove_track(*this);
 }
 
 void Track::set_position(const Point &p)
@@ -85,12 +95,36 @@ void Track::check_slope()
 
 void Track::set_turnout_id(unsigned i)
 {
+	if(!type.is_turnout())
+		throw InvalidState("Not a turnout");
+
 	turnout_id = i;
+	layout.create_blocks(*this);
+	if(layout.has_driver() && turnout_id)
+		layout.get_driver().add_turnout(turnout_id);
 }
 
 void Track::set_sensor_id(unsigned i)
 {
+	if(type.is_turnout())
+		throw InvalidState("Can't set sensor on a turnout");
+
 	sensor_id = i;
+	layout.create_blocks(*this);
+	if(layout.has_driver() && sensor_id)
+		layout.get_driver().add_sensor(sensor_id);
+}
+
+void Track::set_active_path(unsigned p)
+{
+	if(!turnout_id)
+		throw InvalidState("Not a turnout");
+	if(!(type.get_paths()&(1<<p)))
+		throw InvalidParameterValue("Invalid path");
+
+	layout.get_driver().set_turnout(turnout_id, p&1);
+	if(type.get_n_paths()>2)
+		layout.get_driver().set_turnout(turnout_id+1, p&2);
 }
 
 int Track::get_endpoint_by_link(const Track &other) const
@@ -164,6 +198,7 @@ bool Track::snap_to(Track &other, bool link)
 						break_link(*links[i]);
 					links[i] = &other;
 					other.links[j] = this;
+					layout.create_blocks(*this);
 				}
 
 				return true;
@@ -201,6 +236,8 @@ void Track::break_link(Track &trk)
 		{
 			*i = 0;
 			trk.break_link(*this);
+			// XXX Creates the blocks twice
+			layout.create_blocks(*this);
 			return;
 		}
 }
@@ -223,7 +260,7 @@ Track *Track::get_link(unsigned i) const
 	return links[i];
 }
 
-int Track::traverse(unsigned i, unsigned route) const
+unsigned Track::traverse(unsigned i, unsigned path) const
 {
 	const vector<Endpoint> &eps = type.get_endpoints();
 	if(i>=eps.size())
@@ -231,25 +268,25 @@ int Track::traverse(unsigned i, unsigned route) const
 
 	const Endpoint &ep = eps[i];
 	
-	if(ep.routes&(1<<route))
+	if(ep.paths&(1<<path))
 	{
-		// Find the other endpoint for this route
+		// Find the other endpoint for this path
 		for(unsigned j=0; j<eps.size(); ++j)
-			if((eps[j].routes&(1<<route)) && j!=i)
+			if((eps[j].paths&(1<<path)) && j!=i)
 				return j;
 	}
 	else
 	{
-		// Find an endpoint that's connected to this one and has the requested route
+		// Find an endpoint that's connected to this one and has the requested path
 		for(unsigned j=0; j<eps.size(); ++j)
-			if((eps[j].routes&(1<<route)) && (eps[j].routes&ep.routes))
+			if((eps[j].paths&(1<<path)) && (eps[j].paths&ep.paths))
 				return j;
 	}
 
-	return -1;
+	throw Exception("Track endpoint did not have a counterpart");
 }
 
-Point Track::get_point(unsigned epi, unsigned route, float d) const
+Point Track::get_point(unsigned epi, unsigned path, float d) const
 {
 	const vector<Endpoint> &eps = type.get_endpoints();
 	if(epi>=eps.size())
@@ -257,6 +294,17 @@ Point Track::get_point(unsigned epi, unsigned route, float d) const
 
 	float x = eps[epi].pos.x;
 	float y = eps[epi].pos.y;
+	float z = 0;
+	float slope_norm = 0;
+	if(eps.size()==2)
+	{
+		slope_norm = slope/type.get_total_length();
+		if(epi==1)
+		{
+			z = slope;
+			slope_norm = -slope_norm;
+		}
+	}
 
 	const vector<TrackPart> &parts = type.get_parts();
 	const TrackPart *last_part = 0;
@@ -264,7 +312,7 @@ Point Track::get_point(unsigned epi, unsigned route, float d) const
 	{
 		for(vector<TrackPart>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
 		{
-			if((eps[epi].routes&(1<<route)) && i->route!=route)
+			if((eps[epi].paths&(1<<path)) && i->path!=path)
 				continue;
 			if(&*i==last_part)
 				continue;
@@ -282,18 +330,20 @@ Point Track::get_point(unsigned epi, unsigned route, float d) const
 						plen *= abs(i->radius);
 					if(d<plen)
 					{
+						z += d*slope_norm;
 						if(j==1)
 							d = plen-d;
 						Point p = i->get_point(d);
 						float c = cos(rot);
 						float s = sin(rot);
-						return Point(pos.x+c*p.x-s*p.y, pos.y+c*p.y+s*p.x);
+						return Point(pos.x+c*p.x-s*p.y, pos.y+c*p.y+s*p.x, pos.z+z);
 					}
 					else if(part_eps.size()>1)
 					{
 						d -= plen;
 						x = part_eps[1-j].pos.x;
 						y = part_eps[1-j].pos.y;
+						z += plen*slope_norm;
 						last_part = &*i;
 						i = parts.begin();
 						break;
@@ -311,17 +361,6 @@ Point Track::get_point(unsigned epi, unsigned route, float d) const
 	}
 }
 
-Track *Track::copy() const
-{
-	Track *trk = new Track(type);
-	trk->set_position(pos);
-	trk->set_rotation(rot);
-	trk->set_slope(slope);
-	trk->set_flex(flex);
-
-	return trk;
-}
-
 void Track::save(list<DataFile::Statement> &st) const
 {
 	st.push_back((DataFile::Statement("position"), pos.x, pos.y, pos.z));
@@ -335,6 +374,17 @@ void Track::save(list<DataFile::Statement> &st) const
 		st.push_back((DataFile::Statement("flex"), true));
 }
 
+void Track::turnout_event(unsigned addr, bool state)
+{
+	if(!turnout_id)
+		return;
+
+	if(addr==turnout_id)
+		active_path = (active_path&2) | (state ? 1 : 0);
+	else if(type.is_double_address() && addr==turnout_id+1)
+		active_path = (active_path&1) | (state ? 2 : 0);
+}
+
 
 Track::Loader::Loader(Track &t):
 	DataFile::BasicLoader<Track>(t)
@@ -342,8 +392,8 @@ Track::Loader::Loader(Track &t):
 	add("position",   &Loader::position);
 	add("rotation",   &Track::rot);
 	add("slope",      &Track::slope);
-	add("turnout_id", &Track::turnout_id);
-	add("sensor_id",  &Track::sensor_id);
+	add("turnout_id", &Loader::turnout_id);
+	add("sensor_id",  &Loader::sensor_id);
 	add("flex",       &Track::flex);
 }
 
@@ -352,4 +402,14 @@ void Track::Loader::position(float x, float y, float z)
 	obj.pos = Point(x, y, z);
 }
 
+void Track::Loader::sensor_id(unsigned id)
+{
+	obj.set_sensor_id(id);
+}
+
+void Track::Loader::turnout_id(unsigned id)
+{
+	obj.set_turnout_id(id);
+}
+
 } // namespace Marklin