X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fsignal.cpp;h=02a07d76bc9585861b4c7df0a0954f3060772d7c;hb=4655bb74f9d6d7f6db8fca9e22721e6c0e1ada12;hp=38e11248793258641a6ef3557c247bb8406f3b09;hpb=e214fd389b9819eac0379cfb78e0f446e267b839;p=r2c2.git

diff --git a/source/libr2c2/signal.cpp b/source/libr2c2/signal.cpp
index 38e1124..02a07d7 100644
--- a/source/libr2c2/signal.cpp
+++ b/source/libr2c2/signal.cpp
@@ -14,12 +14,9 @@ using namespace Msp;
 namespace R2C2 {
 
 Signal::Signal(Layout &l, const SignalType &t):
-	Object(l),
+	TrackAttachment(l),
 	type(t),
 	address(0),
-	track(0),
-	block(0),
-	entry(0),
 	train(0),
 	check_allocated_blocks(false),
 	passing(false)
@@ -31,6 +28,8 @@ Signal::Signal(Layout &l, const SignalType &t):
 
 Signal::~Signal()
 {
+	if(layout.has_driver() && address)
+		layout.get_driver().remove_sensor(address);
 	layout.remove(*this);
 }
 
@@ -44,65 +43,39 @@ Signal *Signal::clone(Layout *to_layout) const
 
 void Signal::set_address(unsigned a)
 {
+	Driver *driver = (layout.has_driver() ? &layout.get_driver() : 0);
+
+	if(driver && address)
+		driver->remove_signal(address);
 	address = a;
-	
-	if(layout.has_driver() && address)
-		layout.get_driver().add_signal(address, type);
+	if(driver && address)
+		driver->add_signal(address, type);
 }
 
 void Signal::set_position(const Vector &p)
 {
 	position = p;
 
-	update_location();
+	update_attachment();
+	signal_moved.emit();
 }
 
-void Signal::update_location()
+void Signal::set_rotation(const Angle &r)
 {
-	const set<Track *> &tracks = layout.get_all<Track>();
-	float limit = layout.get_catalogue().get_gauge()*2;
-	float dist = -1;
-	for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
-		if(!(*i)->get_type().is_turnout())
-		{
-			Snap sn;
-			sn.position = position;
-			sn.rotation = rotation;
-			(*i)->snap(sn, limit, SNAP_SEGMENT);
-			float d = distance(position, sn.position);
-			if(d<dist || dist<0)
-			{
-				track = *i;
-				dist = d;
-			}
-		}
-
-	block = 0;
-
-	if(!track)
-		return;
+	rotation = r;
 
-	unsigned n_endpoints = track->get_type().get_endpoints().size();
-	for(unsigned j=0; j<n_endpoints; ++j)
-	{
-		Angle a = wrap_with_base(track->get_snap_node(j).rotation-rotation, -Angle::quarter_turn());
-		if(a>=Angle::quarter_turn())
-		{
-			BlockIter biter = TrackIter(track, j).block_iter();
-			if(biter)
-			{
-				block = &track->get_block();
-				entry = biter.entry();
-			}
-		}
-	}
+	update_attachment();
+	signal_moved.emit();
 }
 
-void Signal::set_rotation(const Angle &r)
+void Signal::update_attachment()
 {
-	rotation = r;
+	attach_to_closest(2);
 
-	update_location();
+	if(track)
+		block = track.block_iter();
+	else
+		block = BlockIter();
 }
 
 unsigned Signal::get_n_snap_nodes() const
@@ -134,13 +107,16 @@ void Signal::tick(const Time::TimeDelta &)
 	if(check_allocated_blocks)
 	{
 		unsigned n_blocks = 0;
-		BlockIter iter(block, entry);
-		iter = iter.next();
-		while(iter && iter->get_train()==train)
+		const Block *last = train->get_block_allocator().last().block();
+		if(block.block()!=last)
 		{
-			if(iter->get_sensor_id())
-				++n_blocks;
-			iter=iter.next();
+			BlockIter iter = block.next();
+			while(iter && iter->get_train()==train && iter.block()!=last)
+			{
+				if(iter->get_sensor_address())
+					++n_blocks;
+				iter = iter.next();
+			}
 		}
 		check_allocated_blocks = false;
 
@@ -159,12 +135,12 @@ void Signal::tick(const Time::TimeDelta &)
 
 void Signal::block_reserved(const Block &b, Train *t)
 {
-	if(&b==block)
+	if(&b==block.block())
 	{
 		if(t)
 		{
 			const BlockIter &b_iter = t->get_block_allocator().iter_for(b);
-			if(b_iter && b_iter.entry()==entry)
+			if(b_iter && b_iter.entry()==block.entry())
 			{
 				if(train_conn)
 					train_conn.disconnect();
@@ -186,9 +162,9 @@ void Signal::block_reserved(const Block &b, Train *t)
 
 void Signal::train_advanced(Block &b)
 {
-	if(&b==block)
+	if(&b==block.block())
 		passing = true;
-	else if(passing && b.get_sensor_id())
+	else if(passing && b.get_sensor_address())
 	{
 		layout.get_driver().set_signal(address, type.get_indications().back().aspect);
 		reset();