X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Fblock.cpp;h=952fe50d56adc538ad6f4e8cab526cb815485a33;hb=2bb6ce8ada216c0b2caa48f4639d03f2c581098e;hp=a29469c4fd9b97e32751987e3c42ac6f903b078e;hpb=4d84248a4990e913a56f013e67a608ad9698233e;p=r2c2.git

diff --git a/source/libmarklin/block.cpp b/source/libmarklin/block.cpp
index a29469c..952fe50 100644
--- a/source/libmarklin/block.cpp
+++ b/source/libmarklin/block.cpp
@@ -1,30 +1,31 @@
 /* $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 <algorithm>
-#include "control.h"
 #include "block.h"
+#include "layout.h"
+#include "route.h"
+#include "trackiter.h"
 #include "tracktype.h"
-#include "trafficmanager.h"
-#include "turnout.h"
 
 using namespace std;
 using namespace Msp;
 
 namespace Marklin {
 
-Block::Block(TrafficManager &tm, Track &start):
-	trfc_mgr(tm),
+Block::Block(Layout &l, Track &start):
+	layout(l),
 	id(0),
 	sensor_id(start.get_sensor_id()),
 	turnout_id(start.get_turnout_id()),
 	train(0)
 {
 	tracks.insert(&start);
+	start.set_block(this);
 
 	list<Track *> queue;
 	queue.push_back(&start);
@@ -42,16 +43,14 @@ Block::Block(TrafficManager &tm, Track &start):
 				{
 					queue.push_back(links[i]);
 					tracks.insert(links[i]);
+					links[i]->set_block(this);
 				}
 				else
 					endpoints.push_back(Endpoint(track, i));
 			}
 	}
 
-	if(sensor_id)
-		id = 0x1000|sensor_id;
-	else if(turnout_id)
-		id = 0x2000|turnout_id;
+	determine_id();
 
 	for(unsigned i=0; i<endpoints.size(); ++i)
 	{
@@ -60,9 +59,33 @@ Block::Block(TrafficManager &tm, Track &start):
 		set<Track *> visited;
 		find_paths(*endpoints[i].track, endpoints[i].track_ep, path, visited);
 	}
+
+	layout.add_block(*this);
+}
+
+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)
+		{
+			i->link = 0;
+			blk->break_link(*this);
+		}
+
+	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)
@@ -71,42 +94,28 @@ int Block::get_endpoint_by_link(const Block &other) const
 	return -1;
 }
 
-unsigned Block::traverse(unsigned epi, float *len) const
+float Block::get_path_length(unsigned entry, const Route *route) const
 {
-	if(epi>=endpoints.size())
+	if(entry>=endpoints.size())
 		throw InvalidParameterValue("Endpoint index out of range");
 
-	const Endpoint &ep = endpoints[epi];
-	Track *track = ep.track;
-	unsigned track_ep = ep.track_ep;
+	TrackIter t_iter(endpoints[entry].track, endpoints[entry].track_ep);
 
-	if(len)
-		*len = 0;
-
-	while(1)
+	float result = 0;
+	while(t_iter && has_track(*t_iter))
 	{
-		unsigned cur_path = 0;
-		unsigned tid = track->get_turnout_id();
-		if(tid)
-		{
-			Turnout &turnout = trfc_mgr.get_control().get_turnout(tid);
-			cur_path = turnout.get_path();
-		}
+		int path = -1;
+		if(t_iter->get_turnout_id() && route)
+			path = route->get_turnout(t_iter->get_turnout_id());
+		if(path==-1)
+			path = t_iter->get_active_path();
 
-		if(len)
-			*len += track->get_type().get_path_length(cur_path);
+		result += t_iter->get_type().get_path_length(path);
 
-		unsigned other_ep = track->traverse(track_ep, cur_path);
-		for(unsigned i=0; i<endpoints.size(); ++i)
-			if(endpoints[i].track==track && endpoints[i].track_ep==static_cast<unsigned>(other_ep))
-				return i;
-
-		Track *next = track->get_link(other_ep);
-		if(!tracks.count(next))
-			throw LogicError("Block traversal strayed out of the block");
-		track_ep = next->get_endpoint_by_link(*track);
-		track = next;
+		t_iter = t_iter.next(path);
 	}
+
+	return result;
 }
 
 void Block::check_link(Block &other)
@@ -121,17 +130,22 @@ void Block::check_link(Block &other)
 			{
 				i->link = &other;
 				j->link = this;
+
+				determine_id();
+				other.determine_id();
 			}
 	}
+}
 
-	if(!sensor_id && !turnout_id && endpoints.size()==2)
-	{
-		unsigned id1 = endpoints[0].link ? endpoints[0].link->get_id() : 1;
-		unsigned id2 = endpoints[1].link ? endpoints[1].link->get_id() : 1;
-		if(id2<id1)
-			swap(id1, id2);
-		id = (id1<<16)|id2;
-	}
+void Block::break_link(Block &other)
+{
+	for(vector<Endpoint>::iterator i=endpoints.begin(); i!=endpoints.end(); ++i)
+		if(i->link==&other)
+		{
+			i->link = 0;
+			other.break_link(*this);
+			determine_id();
+		}
 }
 
 Block *Block::get_link(unsigned epi) const
@@ -141,12 +155,12 @@ Block *Block::get_link(unsigned epi) const
 	return endpoints[epi].link;
 }
 
-bool Block::reserve(const Train *t)
+bool Block::reserve(Train *t)
 {
 	if(!t || !train)
 	{
 		train = t;
-		trfc_mgr.signal_block_reserved.emit(*this, train);
+		layout.signal_block_reserved.emit(*this, train);
 		return true;
 	}
 	else
@@ -177,6 +191,27 @@ void Block::find_paths(Track &track, unsigned track_ep, unsigned path, set<Track
 	}
 }
 
+void Block::determine_id()
+{
+	if(sensor_id)
+		id = 0x1000|sensor_id;
+	else if(turnout_id)
+		id = 0x2000|turnout_id;
+	else if(endpoints.size()==2)
+	{
+		unsigned id1 = endpoints[0].link ? endpoints[0].link->get_id() : 1;
+		unsigned id2 = endpoints[1].link ? endpoints[1].link->get_id() : 1;
+		if(id2<id1)
+			swap(id1, id2);
+		id = (id1<<16)|id2;
+	}
+	else if(endpoints.size()==1)
+	{
+		unsigned id1 = endpoints[0].link ? endpoints[0].link->get_id() : 1;
+		id = 0x10000 | id1;
+	}
+}
+
 
 Block::Endpoint::Endpoint(Track *t, unsigned e):
 	track(t),