Add TrackIter and BlockIter classes

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

diff --git a/source/libmarklin/track.cpp b/source/libmarklin/track.cpp
index 208d40f10cdbbdfe09e81f6457c1a29a3da1a7c8..6ec3c3bf7cefc78041f3ddb357acdfb1b3fa203a 100644 (file)
--- a/source/libmarklin/track.cpp
+++ b/source/libmarklin/track.cpp
@@ -6,6 +6,7 @@ Distributed under the GPL
 */
 
 #include <cmath>
+#include "block.h"
 #include "driver.h"
 #include "layout.h"
 #include "track.h"
@@ -19,12 +20,13 @@ namespace Marklin {
 Track::Track(Layout &l, const TrackType &t):
        layout(l),
        type(t),
+       block(0),
        rot(0),
        slope(0),
        flex(false),
-       turnout_id(0),
+       turnout_id(type.is_turnout() ? layout.allocate_turnout_id(type.is_double_address()) : 0),
        sensor_id(0),
-       links(t.get_endpoints().size()),
+       links(type.get_endpoints().size()),
        active_path(0)
 {
        layout.add_track(*this);
@@ -41,6 +43,24 @@ Track::~Track()
        layout.remove_track(*this);
 }
 
+void Track::set_block(Block *b)
+{
+       if(b && !b->has_track(*this))
+               throw InvalidParameterValue("Track is not in the Block");
+       if(!b && block && block->has_track(*this))
+               throw InvalidState("Track is still in a Block");
+
+       block = b;
+}
+
+Block &Track::get_block() const
+{
+       if(!block)
+               throw InvalidState("No Block");
+
+       return *block;
+}
+
 void Track::set_position(const Point &p)
 {
        pos = p;
@@ -103,6 +123,7 @@ void Track::set_turnout_id(unsigned i)
 
        turnout_id = i;
        layout.create_blocks(*this);
+       layout.update_routes();
        if(layout.has_driver() && turnout_id)
        {
                layout.get_driver().add_turnout(turnout_id);
@@ -130,11 +151,13 @@ 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
+int Track::get_endpoint_by_link(Track &other) const
 {
        for(unsigned i=0; i<links.size(); ++i)
                if(links[i]==&other)
@@ -173,7 +196,7 @@ float Track::get_endpoint_direction(unsigned epi) const
 
 bool Track::snap_to(Track &other, bool link)
 {
-       float limit = (link && !flex) ? 1e-6 : 1e-4;
+       float limit = (link && !flex && !other.get_flex()) ? 1e-6 : 1e-4;
        const vector<Endpoint> &eps = type.get_endpoints();
        const vector<Endpoint> &other_eps = other.get_type().get_endpoints();
 
@@ -191,13 +214,16 @@ bool Track::snap_to(Track &other, bool link)
                        float dy = epp2.y-epp.y;
                        if(dx*dx+dy*dy<limit)
                        {
-                               set_rotation(other.rot+other_eps[j].dir-eps[i].dir+M_PI);
-                               Point p(epp2.x-(eps[i].pos.x*cos(rot)-eps[i].pos.y*sin(rot)),
-                                       epp2.y-(eps[i].pos.y*cos(rot)+eps[i].pos.x*sin(rot)),
-                                       epp2.z);
-                               if(eps.size()==2 && i==1)
-                                       p.z -= slope;
-                               set_position(p);
+                               if(!link || (!flex && !other.get_flex()))
+                               {
+                                       set_rotation(other.rot+other_eps[j].dir-eps[i].dir+M_PI);
+                                       Point p(epp2.x-(eps[i].pos.x*cos(rot)-eps[i].pos.y*sin(rot)),
+                                               epp2.y-(eps[i].pos.y*cos(rot)+eps[i].pos.x*sin(rot)),
+                                               epp2.z);
+                                       if(eps.size()==2 && i==1)
+                                               p.z -= slope;
+                                       set_position(p);
+                               }
 
                                if(link)
                                {
@@ -267,44 +293,13 @@ Track *Track::get_link(unsigned i) const
        return links[i];
 }
 
-unsigned Track::traverse(unsigned i, unsigned path) const
-{
-       const vector<Endpoint> &eps = type.get_endpoints();
-       if(i>=eps.size())
-               throw InvalidParameterValue("Endpoint index out of range");
-
-       const Endpoint &ep = eps[i];
-       
-       if(ep.paths&(1<<path))
-       {
-               // Find the other endpoint for this path
-               for(unsigned j=0; j<eps.size(); ++j)
-                       if((eps[j].paths&(1<<path)) && j!=i)
-                               return j;
-       }
-       else
-       {
-               // Find an endpoint that's connected to this one and has the requested path
-               for(unsigned j=0; j<eps.size(); ++j)
-                       if((eps[j].paths&(1<<path)) && (eps[j].paths&ep.paths))
-                               return j;
-       }
-
-       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);
        float c = cos(rot);
        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.pos = Point(pos.x+c*p.pos.x-s*p.pos.y, pos.y+s*p.pos.x+c*p.pos.y, pos.z);
        p.dir += rot;
        if(type.get_endpoints().size()==2)
        {
@@ -312,12 +307,12 @@ TrackPoint Track::get_point(unsigned epi, unsigned path, float d) const
                float grade = slope/len;
                if(epi==0)
                {
-                       p.pos.z = pos.z+grade*d;
+                       p.pos.z += grade*d;
                        p.grade = grade;
                }
                else
                {
-                       p.pos.z = pos.z+slope-grade*d;
+                       p.pos.z += slope-grade*d;
                        p.grade = -grade;
                }
        }