X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fblock.cpp;h=f02762c85a958e668b5b4e200c86bcbb877f0767;hb=f730acd5fa2b4f0d0185770ff7950ab814aec47c;hp=386f2378a3b20011733cb54a17880cdd64a2d50b;hpb=54392d65e2053d1eacb4cfcc435f1013993f2973;p=r2c2.git

diff --git a/source/libr2c2/block.cpp b/source/libr2c2/block.cpp
index 386f237..f02762c 100644
--- a/source/libr2c2/block.cpp
+++ b/source/libr2c2/block.cpp
@@ -4,6 +4,7 @@
 #include "driver.h"
 #include "layout.h"
 #include "route.h"
+#include "trackcircuit.h"
 #include "trackiter.h"
 #include "tracktype.h"
 
@@ -13,52 +14,40 @@ using namespace Msp;
 namespace R2C2 {
 
 Block::Block(Layout &l, Track &start):
-	layout(l),
+	TrackChain(l),
 	id(0),
 	sensor_id(start.get_sensor_id()),
 	turnout_id(start.get_turnout_id()),
-	state(INACTIVE),
+	sensor(0),
 	train(0)
 {
-	tracks.insert(&start);
-	start.set_block(this);
+	add_track(start);
 
-	list<Track *> queue;
-	queue.push_back(&start);
-
-	while(!queue.empty())
+	if(start.get_type().is_turnout())
 	{
-		Track *track = queue.front();
-		queue.erase(queue.begin());
-
-		const vector<Track *> &links = track->get_links();
-		for(unsigned i=0; i<links.size(); ++i)
-			if(links[i] && !tracks.count(links[i]))
-			{
-				if(links[i]->get_sensor_id()==sensor_id && links[i]->get_turnout_id()==turnout_id)
-				{
-					queue.push_back(links[i]);
-					tracks.insert(links[i]);
-					links[i]->set_block(this);
-				}
-				else
-					endpoints.push_back(Endpoint(track, i));
-			}
+		unsigned nls = start.get_n_link_slots();
+		for(unsigned i=0; i<nls; ++i)
+			endpoints.push_back(Endpoint(&start, i));
 	}
-
-	determine_id();
-
-	for(unsigned i=0; i<endpoints.size(); ++i)
+	else
 	{
-		unsigned path = 1<<i;
-		endpoints[i].paths |= path;
-		find_paths(endpoints[i].track_iter(), path);
+		unsigned nls = start.get_n_link_slots();
+		for(unsigned i=0; i<nls; ++i)
+		{
+			TrackIter iter = TrackIter(&start, i).flip();
+			for(; (iter && check_validity(*iter)==VALID); iter=iter.next())
+				add_track(*iter);
+			if((iter = iter.flip()))
+				endpoints.push_back(Endpoint(iter.track(), iter.entry()));
+		}
 	}
 
-	if(sensor_id && layout.has_driver())
-		layout.get_driver().signal_sensor.connect(sigc::mem_fun(this, &Block::sensor_event));
+	determine_id();
+
+	if(sensor_id)
+		sensor = new TrackCircuit(layout, *this);
 
-	layout.add_block(*this);
+	layout.add(*this);
 }
 
 Block::~Block()
@@ -75,12 +64,22 @@ Block::~Block()
 			blk->break_link(*this);
 		}
 
-	layout.remove_block(*this);
+	layout.remove(*this);
+
+	delete sensor;
+}
+
+void Block::on_track_added(Track &track)
+{
+	track.set_block(this);
 }
 
-bool Block::has_track(Track &t) const
+TrackChain::Validity Block::check_validity(Track &track) const
 {
-	return tracks.count(&t);
+	if(track.get_sensor_id()!=sensor_id || track.get_turnout_id()!=turnout_id)
+		return INCOMPATIBLE;
+
+	return TrackChain::check_validity(track);
 }
 
 const Block::Endpoint &Block::get_endpoint(unsigned i) const
@@ -168,44 +167,6 @@ bool Block::reserve(Train *t)
 		return false;
 }
 
-void Block::tick(const Time::TimeDelta &dt)
-{
-	if(state_confirm_timeout)
-	{
-		state_confirm_timeout -= dt;
-		if(state_confirm_timeout<=Time::zero)
-		{
-			if(state==MAYBE_INACTIVE)
-				state = INACTIVE;
-			else if(state==MAYBE_ACTIVE)
-				state = ACTIVE;
-			state_confirm_timeout = Time::zero;
-			signal_state_changed.emit(state);
-		}
-	}
-}
-
-void Block::find_paths(const TrackIter &track, unsigned path)
-{
-	unsigned mask = track.endpoint().paths;
-	for(unsigned i=0; mask>>i; ++i)
-		if(mask&(1<<i))
-		{
-			TrackIter next = track.next(i);
-			if(!next)
-				continue;
-			else if(has_track(*next))
-				find_paths(track.next(i), path);
-			else
-			{
-				next = next.flip();
-				for(vector<Endpoint>::iterator j=endpoints.begin(); j!=endpoints.end(); ++j)
-					if(j->track==next.track() && j->track_ep==next.entry())
-						j->paths |= path;
-			}
-		}
-}
-
 void Block::determine_id()
 {
 	if(sensor_id)
@@ -227,31 +188,11 @@ void Block::determine_id()
 	}
 }
 
-void Block::sensor_event(unsigned addr, bool s)
-{
-	if(addr==sensor_id)
-	{
-		if(s && state<MAYBE_ACTIVE)
-		{
-			state = MAYBE_ACTIVE;
-			state_confirm_timeout = 300*Time::msec;
-			signal_state_changed.emit(state);
-		}
-		else if(!s && state>MAYBE_INACTIVE)
-		{
-			state = MAYBE_INACTIVE;
-			state_confirm_timeout = 700*Time::msec;
-			signal_state_changed.emit(state);
-		}
-	}
-}
-
 
 Block::Endpoint::Endpoint(Track *t, unsigned e):
 	track(t),
 	track_ep(e),
-	link(0),
-	paths(0)
+	link(0)
 { }
 
 TrackIter Block::Endpoint::track_iter() const