Add a separate double_address flag to TrackType

[r2c2.git] / source / libmarklin / track.cpp

diff --git a/source/libmarklin/track.cpp b/source/libmarklin/track.cpp
index 7c08b6c46766c0d3e116c775d2f9f802e5c81653..05f9f2f717c1044b47446b73aeab0ac01f68b73b 100644 (file)
--- a/source/libmarklin/track.cpp
+++ b/source/libmarklin/track.cpp
@@ -104,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)
@@ -126,8 +130,10 @@ void Track::set_active_path(unsigned p)
                throw InvalidParameterValue("Invalid path");
 
        layout.get_driver().set_turnout(turnout_id, p&1);
-       if(type.get_n_paths()>2)
+       if(type.is_double_address())
                layout.get_driver().set_turnout(turnout_id+1, p&2);
+       else if(type.get_n_paths()>2)
+               active_path = (active_path&1) | (p&2);
 }
 
 int Track::get_endpoint_by_link(const Track &other) const
@@ -289,6 +295,11 @@ unsigned Track::traverse(unsigned i, unsigned path) const
        throw Exception("Track endpoint did not have a counterpart");
 }
 
+unsigned Track::traverse(unsigned i) const
+{
+       return traverse(i, active_path);
+}
+
 TrackPoint Track::get_point(unsigned epi, unsigned path, float d) const
 {
        TrackPoint p = type.get_point(epi, path, d);
@@ -296,6 +307,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);
@@ -315,6 +327,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));