X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrack.cpp;h=fbe3f0a709ffe1d2030c37fccee15b78ac134095;hb=9b05c573a38639827697fe393d55b7c76f5bde45;hp=c940e1cd93d15e517f1501506e228172362aba6c;hpb=29b131b59ba562f996a338a453745e5a4dfad5b7;p=r2c2.git

diff --git a/source/libmarklin/track.cpp b/source/libmarklin/track.cpp
index c940e1c..fbe3f0a 100644
--- a/source/libmarklin/track.cpp
+++ b/source/libmarklin/track.cpp
@@ -6,6 +6,8 @@ Distributed under the GPL
 */
 
 #include <cmath>
+#include "block.h"
+#include "catalogue.h"
 #include "driver.h"
 #include "layout.h"
 #include "track.h"
@@ -19,6 +21,7 @@ namespace Marklin {
 Track::Track(Layout &l, const TrackType &t):
 	layout(l),
 	type(t),
+	block(0),
 	rot(0),
 	slope(0),
 	flex(false),
@@ -41,6 +44,24 @@ Track::~Track()
 	layout.remove_track(*this);
 }
 
+void Track::set_block(Block *b)
+{
+	if(b && !b->has_track(*this))
+		throw InvalidParameterValue("Track is not in the Block");
+	if(!b && block && block->has_track(*this))
+		throw InvalidState("Track is still in a Block");
+
+	block = b;
+}
+
+Block &Track::get_block() const
+{
+	if(!block)
+		throw InvalidState("No Block");
+
+	return *block;
+}
+
 void Track::set_position(const Point &p)
 {
 	pos = p;
@@ -137,7 +158,7 @@ void Track::set_active_path(unsigned p)
 		active_path = (active_path&1) | (p&2);
 }
 
-int Track::get_endpoint_by_link(const Track &other) const
+int Track::get_endpoint_by_link(Track &other) const
 {
 	for(unsigned i=0; i<links.size(); ++i)
 		if(links[i]==&other)
@@ -148,11 +169,11 @@ int Track::get_endpoint_by_link(const Track &other) const
 
 Point Track::get_endpoint_position(unsigned epi) const
 {
-	const vector<Endpoint> &eps = type.get_endpoints();
+	const vector<TrackType::Endpoint> &eps = type.get_endpoints();
 	if(epi>=eps.size())
-		throw InvalidParameterValue("Endpoint index out of range");
+		throw InvalidParameterValue("TrackType::Endpoint index out of range");
 
-	const Endpoint &ep = eps[epi];
+	const TrackType::Endpoint &ep = eps[epi];
 
 	float c = cos(rot);
 	float s = sin(rot);
@@ -165,20 +186,27 @@ Point Track::get_endpoint_position(unsigned epi) const
 
 float Track::get_endpoint_direction(unsigned epi) const
 {
-	const vector<Endpoint> &eps = type.get_endpoints();
+	const vector<TrackType::Endpoint> &eps = type.get_endpoints();
 	if(epi>=eps.size())
-		throw InvalidParameterValue("Endpoint index out of range");
+		throw InvalidParameterValue("TrackType::Endpoint index out of range");
 
-	const Endpoint &ep = eps[epi];
+	const TrackType::Endpoint &ep = eps[epi];
 
 	return rot+ep.dir;
 }
 
-bool Track::snap_to(Track &other, bool link)
+bool Track::snap_to(Track &other, bool link, float limit)
 {
-	float limit = (link && !flex && !other.get_flex()) ? 1e-6 : 1e-4;
-	const vector<Endpoint> &eps = type.get_endpoints();
-	const vector<Endpoint> &other_eps = other.get_type().get_endpoints();
+	if(!limit || link)
+	{
+		limit = layout.get_catalogue().get_gauge();
+		if(link && !flex && !other.get_flex())
+			limit /= 10;
+	}
+	limit *= limit;
+
+	const vector<TrackType::Endpoint> &eps = type.get_endpoints();
+	const vector<TrackType::Endpoint> &other_eps = other.get_type().get_endpoints();
 
 	for(unsigned i=0; i<eps.size(); ++i)
 	{
@@ -192,7 +220,8 @@ bool Track::snap_to(Track &other, bool link)
 			Point epp2 = other.get_endpoint_position(j);
 			float dx = epp2.x-epp.x;
 			float dy = epp2.y-epp.y;
-			if(dx*dx+dy*dy<limit)
+			float dz = epp2.z-epp.z;
+			if(dx*dx+dy*dy<limit && dz*dz<limit)
 			{
 				if(!link || (!flex && !other.get_flex()))
 				{
@@ -224,7 +253,7 @@ bool Track::snap_to(Track &other, bool link)
 
 bool Track::snap(Point &pt, float &d) const
 {
-	const vector<Endpoint> &eps = type.get_endpoints();
+	const vector<TrackType::Endpoint> &eps = type.get_endpoints();
 
 	for(unsigned i=0; i<eps.size(); ++i)
 	{
@@ -273,37 +302,6 @@ Track *Track::get_link(unsigned i) const
 	return links[i];
 }
 
-unsigned Track::traverse(unsigned i, unsigned path) const
-{
-	const vector<Endpoint> &eps = type.get_endpoints();
-	if(i>=eps.size())
-		throw InvalidParameterValue("Endpoint index out of range");
-
-	const Endpoint &ep = eps[i];
-	
-	if(ep.paths&(1<<path))
-	{
-		// Find the other endpoint for this path
-		for(unsigned j=0; j<eps.size(); ++j)
-			if((eps[j].paths&(1<<path)) && j!=i)
-				return j;
-	}
-	else
-	{
-		// 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].paths&(1<<path)) && (eps[j].paths&ep.paths))
-				return j;
-	}
-
-	throw Exception("Track endpoint did not have a counterpart");
-}
-
-unsigned Track::traverse(unsigned i) const
-{
-	return traverse(i, active_path);
-}
-
 TrackPoint Track::get_point(unsigned epi, unsigned path, float d) const
 {
 	TrackPoint p = type.get_point(epi, path, d);
@@ -358,6 +356,10 @@ void Track::turnout_event(unsigned addr, bool state)
 		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);
+	else
+		return;
+
+	signal_path_changed.emit(active_path);
 }