X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrack.cpp;h=5f1ca438644eea5d094a09dcf61e019fe954f5f2;hb=e9653dffd0026fb3c02c91a4c0feca688a86c721;hp=74e51acab73fddb2246b750d23a3339b9e2dab24;hpb=f409cd39a687900724d987c9db629cbff0dd49be;p=r2c2.git

diff --git a/source/libmarklin/track.cpp b/source/libmarklin/track.cpp
index 74e51ac..5f1ca43 100644
--- a/source/libmarklin/track.cpp
+++ b/source/libmarklin/track.cpp
@@ -6,6 +6,7 @@ Distributed under the GPL
 */
 
 #include <cmath>
+#include "block.h"
 #include "driver.h"
 #include "layout.h"
 #include "track.h"
@@ -19,10 +20,11 @@ namespace Marklin {
 Track::Track(Layout &l, const TrackType &t):
 	layout(l),
 	type(t),
+	block(0),
 	rot(0),
 	slope(0),
 	flex(false),
-	turnout_id(type.is_turnout() ? layout.allocate_turnout_id() : 0),
+	turnout_id(type.is_turnout() ? layout.allocate_turnout_id(type.is_double_address()) : 0),
 	sensor_id(0),
 	links(type.get_endpoints().size()),
 	active_path(0)
@@ -41,6 +43,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 +157,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)
@@ -310,7 +330,7 @@ TrackPoint Track::get_point(unsigned epi, unsigned path, float d) const
 	float c = cos(rot);
 	float s = sin(rot);
 
-	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.pos = Point(pos.x+c*p.pos.x-s*p.pos.y, pos.y+s*p.pos.x+c*p.pos.y, pos.z);
 	p.dir += rot;
 	if(type.get_endpoints().size()==2)
 	{
@@ -318,12 +338,12 @@ TrackPoint Track::get_point(unsigned epi, unsigned path, float d) const
 		float grade = slope/len;
 		if(epi==0)
 		{
-			p.pos.z = pos.z+grade*d;
+			p.pos.z += grade*d;
 			p.grade = grade;
 		}
 		else
 		{
-			p.pos.z = pos.z+slope-grade*d;
+			p.pos.z += slope-grade*d;
 			p.grade = -grade;
 		}
 	}