X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrack.cpp;h=030af70bc85fd1d2e667b4e47a24830a7ac915ea;hb=e5cd9e4fbc577036a0385c985b6b65df8218d0a2;hp=6c72c469a7540972f540e029d68bece473963c09;hpb=a448b6ac73e0eb19980e69b095136eabe95d2534;p=r2c2.git

diff --git a/source/libmarklin/track.cpp b/source/libmarklin/track.cpp
index 6c72c46..030af70 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,29 @@ 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));
+
+	for(unsigned paths = type.get_paths(); !(paths&1); ++active_path, paths>>=1) ;
+}
 
 Track::~Track()
 {
 	break_links();
+	layout.remove_track(*this);
 }
 
 void Track::set_position(const Point &p)
@@ -45,7 +57,8 @@ void Track::set_rotation(float r)
 
 void Track::set_slope(float s)
 {
-	if(links.size()!=2) return;
+	if(links.size()!=2)
+		return;
 
 	slope = s;
 }
@@ -85,12 +98,40 @@ 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);
+		if(type.is_double_address())
+			layout.get_driver().add_turnout(turnout_id+1);
+	}
 }
 
 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 +205,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 +243,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 +267,7 @@ Track *Track::get_link(unsigned i) const
 	return links[i];
 }
 
-int Track::traverse(unsigned i, unsigned path) const
+unsigned Track::traverse(unsigned i, unsigned path) const
 {
 	const vector<Endpoint> &eps = type.get_endpoints();
 	if(i>=eps.size())
@@ -246,93 +290,39 @@ int Track::traverse(unsigned i, unsigned path) const
 				return j;
 	}
 
-	return -1;
+	throw Exception("Track endpoint did not have a counterpart");
 }
 
-Point Track::get_point(unsigned epi, unsigned path, float d) const
+TrackPoint Track::get_point(unsigned epi, unsigned path, float d) const
 {
-	const vector<Endpoint> &eps = type.get_endpoints();
-	if(epi>=eps.size())
-		throw InvalidParameterValue("Endpoint index out of range");
+	TrackPoint p = type.get_point(epi, path, d);
+	float c = cos(rot);
+	float s = sin(rot);
 
-	float x = eps[epi].pos.x;
-	float y = eps[epi].pos.y;
-	float z = 0;
-	float slope_norm = 0;
-	if(eps.size()==2)
+	p.pos = Point(pos.x+c*p.pos.x-s*p.pos.y, pos.y+s*p.pos.x+c*p.pos.y, 0);
+	p.dir += rot;
+	if(type.get_endpoints().size()==2)
 	{
-		slope_norm = slope/type.get_total_length();
-		if(epi==1)
+		float len = type.get_path_length(path);
+		float grade = slope/len;
+		if(epi==0)
 		{
-			z = slope;
-			slope_norm = -slope_norm;
+			p.pos.z = pos.z+grade*d;
+			p.grade = grade;
 		}
-	}
-
-	const vector<TrackPart> &parts = type.get_parts();
-	const TrackPart *last_part = 0;
-	while(1)
-	{
-		for(vector<TrackPart>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
+		else
 		{
-			if((eps[epi].paths&(1<<path)) && i->path!=path)
-				continue;
-			if(&*i==last_part)
-				continue;
-
-			vector<Endpoint> part_eps;
-			i->collect_endpoints(part_eps);
-			for(unsigned j=0; j<part_eps.size(); ++j)
-			{
-				float dx = part_eps[j].pos.x-x;
-				float dy = part_eps[j].pos.y-y;
-				if(dx*dx+dy*dy<1e-6)
-				{
-					float plen = i->length;
-					if(i->radius)
-						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, 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;
-					}
-					else
-						return pos;
-				}
-			}
+			p.pos.z = pos.z+slope-grade*d;
+			p.grade = -grade;
 		}
-
-		if(!last_part)
-			throw Exception("Internal error (Endpoint does not match any part)");
-		else
-			return pos;
 	}
+
+	return p;
 }
 
-Track *Track::copy() const
+TrackPoint Track::get_point(unsigned epi, float d) const
 {
-	Track *trk = new Track(type);
-	trk->set_position(pos);
-	trk->set_rotation(rot);
-	trk->set_slope(slope);
-	trk->set_flex(flex);
-
-	return trk;
+	return get_point(epi, active_path, d);
 }
 
 void Track::save(list<DataFile::Statement> &st) const
@@ -348,6 +338,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)
@@ -355,8 +356,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);
 }
 
@@ -365,4 +366,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