X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrack.cpp;h=030af70bc85fd1d2e667b4e47a24830a7ac915ea;hb=f7ee3202102bfa67fdb6ad93c4f0f90f4c8ffb2c;hp=250888dd6a8f5aa23f331a1bcf39830c789d3af7;hpb=47bff0c8939de3ae20b5ced1ee2f6a264397dcee;p=r2c2.git

diff --git a/source/libmarklin/track.cpp b/source/libmarklin/track.cpp
index 250888d..030af70 100644
--- a/source/libmarklin/track.cpp
+++ b/source/libmarklin/track.cpp
@@ -31,6 +31,8 @@ Track::Track(Layout &l, const TrackType &t):
 
 	if(layout.has_driver())
 		layout.get_driver().signal_turnout.connect(sigc::mem_fun(this, &Track::turnout_event));
+
+	for(unsigned paths = type.get_paths(); !(paths&1); ++active_path, paths>>=1) ;
 }
 
 Track::~Track()
@@ -102,7 +104,11 @@ void Track::set_turnout_id(unsigned i)
 	turnout_id = i;
 	layout.create_blocks(*this);
 	if(layout.has_driver() && turnout_id)
+	{
 		layout.get_driver().add_turnout(turnout_id);
+		if(type.is_double_address())
+			layout.get_driver().add_turnout(turnout_id+1);
+	}
 }
 
 void Track::set_sensor_id(unsigned i)
@@ -294,6 +300,7 @@ TrackPoint Track::get_point(unsigned epi, unsigned path, float d) const
 	float s = sin(rot);
 
 	p.pos = Point(pos.x+c*p.pos.x-s*p.pos.y, pos.y+s*p.pos.x+c*p.pos.y, 0);
+	p.dir += rot;
 	if(type.get_endpoints().size()==2)
 	{
 		float len = type.get_path_length(path);
@@ -313,6 +320,11 @@ TrackPoint Track::get_point(unsigned epi, unsigned path, float d) const
 	return p;
 }
 
+TrackPoint Track::get_point(unsigned epi, float d) const
+{
+	return get_point(epi, active_path, d);
+}
+
 void Track::save(list<DataFile::Statement> &st) const
 {
 	st.push_back((DataFile::Statement("position"), pos.x, pos.y, pos.z));