X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Fblock.cpp;h=ec07947d7e1cbffa500f05b29661ba7178b99fa8;hb=e9653dffd0026fb3c02c91a4c0feca688a86c721;hp=aa16fffc6ba5b6e3f04879f0e3d5fdb206b809c3;hpb=39d3db437ae419bf8195d33422d5ee38962175aa;p=r2c2.git

diff --git a/source/libmarklin/block.cpp b/source/libmarklin/block.cpp
index aa16fff..ec07947 100644
--- a/source/libmarklin/block.cpp
+++ b/source/libmarklin/block.cpp
@@ -8,6 +8,7 @@ Distributed under the GPL
 #include <algorithm>
 #include "block.h"
 #include "layout.h"
+#include "route.h"
 #include "tracktype.h"
 
 using namespace std;
@@ -23,6 +24,7 @@ Block::Block(Layout &l, Track &start):
 	train(0)
 {
 	tracks.insert(&start);
+	start.set_block(this);
 
 	list<Track *> queue;
 	queue.push_back(&start);
@@ -40,6 +42,7 @@ Block::Block(Layout &l, Track &start):
 				{
 					queue.push_back(links[i]);
 					tracks.insert(links[i]);
+					links[i]->set_block(this);
 				}
 				else
 					endpoints.push_back(Endpoint(track, i));
@@ -61,6 +64,11 @@ Block::Block(Layout &l, Track &start):
 
 Block::~Block()
 {
+	set<Track *> trks = tracks;
+	tracks.clear();
+	for(set<Track *>::iterator i=trks.begin(); i!=trks.end(); ++i)
+		(*i)->set_block(0);
+
 	for(vector<Endpoint>::iterator i=endpoints.begin(); i!=endpoints.end(); ++i)
 		if(Block *blk = i->link)
 		{
@@ -71,7 +79,12 @@ Block::~Block()
 	layout.remove_block(*this);
 }
 
-int Block::get_endpoint_by_link(const Block &other) const
+bool Block::has_track(Track &t) const
+{
+	return tracks.count(&t);
+}
+
+int Block::get_endpoint_by_link(Block &other) const
 {
 	for(unsigned i=0; i<endpoints.size(); ++i)
 		if(endpoints[i].link==&other)
@@ -81,6 +94,11 @@ int Block::get_endpoint_by_link(const Block &other) const
 }
 
 unsigned Block::traverse(unsigned epi, float *len) const
+{
+	return traverse(epi, 0, len);
+}
+
+unsigned Block::traverse(unsigned epi, const Route *route, float *len) const
 {
 	if(epi>=endpoints.size())
 		throw InvalidParameterValue("Endpoint index out of range");
@@ -94,7 +112,11 @@ unsigned Block::traverse(unsigned epi, float *len) const
 
 	while(1)
 	{
-		unsigned cur_path = track->get_active_path();
+		int cur_path = -1;
+		if(track->get_turnout_id() && route)
+			cur_path = route->get_turnout(track->get_turnout_id());
+		if(cur_path==-1)
+			cur_path = track->get_active_path();
 
 		if(len)
 			*len += track->get_type().get_path_length(cur_path);