X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fsignal.cpp;h=38e11248793258641a6ef3557c247bb8406f3b09;hb=4529bf980cf3558d86c07266de7d890d3f5e06a6;hp=a25f8eca4697fde499b993348a32a4de7f20e752;hpb=bde934f7d5ba07a9442a305192e10024820d13ed;p=r2c2.git

diff --git a/source/libr2c2/signal.cpp b/source/libr2c2/signal.cpp
index a25f8ec..38e1124 100644
--- a/source/libr2c2/signal.cpp
+++ b/source/libr2c2/signal.cpp
@@ -1,4 +1,5 @@
 #include "blockiter.h"
+#include "catalogue.h"
 #include "driver.h"
 #include "layout.h"
 #include "signal.h"
@@ -23,14 +24,14 @@ Signal::Signal(Layout &l, const SignalType &t):
 	check_allocated_blocks(false),
 	passing(false)
 {
-	layout.add_signal(*this);
+	layout.add(*this);
 
 	layout.signal_block_reserved.connect(sigc::mem_fun(this, &Signal::block_reserved));
 }
 
 Signal::~Signal()
 {
-	layout.remove_signal(*this);
+	layout.remove(*this);
 }
 
 Signal *Signal::clone(Layout *to_layout) const
@@ -51,31 +52,35 @@ void Signal::set_address(unsigned a)
 
 void Signal::set_position(const Vector &p)
 {
-	const set<Track *> &tracks = layout.get_tracks();
+	position = p;
+
+	update_location();
+}
+
+void Signal::update_location()
+{
+	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 = p;
+			sn.position = position;
 			sn.rotation = rotation;
-			(*i)->snap(sn, 1000, SNAP_SEGMENT);
-			float d = distance(p, sn.position);
+			(*i)->snap(sn, limit, SNAP_SEGMENT);
+			float d = distance(position, sn.position);
 			if(d<dist || dist<0)
 			{
-				position = sn.position;
-				rotation = sn.rotation;
 				track = *i;
 				dist = d;
 			}
 		}
 
-	normalize_location();
-}
+	block = 0;
 
-void Signal::normalize_location()
-{
-	block = &track->get_block();
+	if(!track)
+		return;
 
 	unsigned n_endpoints = track->get_type().get_endpoints().size();
 	for(unsigned j=0; j<n_endpoints; ++j)
@@ -84,18 +89,20 @@ void Signal::normalize_location()
 		if(a>=Angle::quarter_turn())
 		{
 			BlockIter biter = TrackIter(track, j).block_iter();
-			entry = biter.entry();
+			if(biter)
+			{
+				block = &track->get_block();
+				entry = biter.entry();
+			}
 		}
 	}
 }
 
 void Signal::set_rotation(const Angle &r)
 {
-	Angle a = wrap_with_base(rotation-r, -Angle::quarter_turn());
-	if(a>=Angle::quarter_turn())
-		rotation = wrap_positive(rotation+Angle::half_turn());
+	rotation = r;
 
-	normalize_location();
+	update_location();
 }
 
 unsigned Signal::get_n_snap_nodes() const
@@ -156,8 +163,8 @@ void Signal::block_reserved(const Block &b, Train *t)
 	{
 		if(t)
 		{
-			int train_entry = t->get_entry_to_block(*block);
-			if(train_entry>=0 && static_cast<unsigned>(train_entry)==entry)
+			const BlockIter &b_iter = t->get_block_allocator().iter_for(b);
+			if(b_iter && b_iter.entry()==entry)
 			{
 				if(train_conn)
 					train_conn.disconnect();