]> git.tdb.fi Git - r2c2.git/blobdiff - source/libmarklin/track.cpp
Move Endpoint inside TrackType
[r2c2.git] / source / libmarklin / track.cpp
index 5843e22f017953474588c956ca73798fcbf4b4be..0a9f1ac83f8977f02935fd6f5838d93265a62278 100644 (file)
@@ -6,6 +6,7 @@ Distributed under the GPL
 */
 
 #include <cmath>
+#include "block.h"
 #include "driver.h"
 #include "layout.h"
 #include "track.h"
@@ -19,18 +20,21 @@ 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);
 
        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()
@@ -39,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;
@@ -55,7 +77,8 @@ void Track::set_rotation(float r)
 
 void Track::set_slope(float s)
 {
-       if(links.size()!=2) return;
+       if(links.size()!=2)
+               return;
 
        slope = s;
 }
@@ -100,8 +123,13 @@ 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);
+               if(type.is_double_address())
+                       layout.get_driver().add_turnout(turnout_id+1);
+       }
 }
 
 void Track::set_sensor_id(unsigned i)
@@ -123,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)
@@ -138,11 +168,11 @@ int Track::get_endpoint_by_link(const Track &other) const
 
 Point Track::get_endpoint_position(unsigned epi) const
 {
-       const vector<Endpoint> &eps = type.get_endpoints();
+       const vector<TrackType::Endpoint> &eps = type.get_endpoints();
        if(epi>=eps.size())
-               throw InvalidParameterValue("Endpoint index out of range");
+               throw InvalidParameterValue("TrackType::Endpoint index out of range");
 
-       const Endpoint &ep = eps[epi];
+       const TrackType::Endpoint &ep = eps[epi];
 
        float c = cos(rot);
        float s = sin(rot);
@@ -155,20 +185,20 @@ Point Track::get_endpoint_position(unsigned epi) const
 
 float Track::get_endpoint_direction(unsigned epi) const
 {
-       const vector<Endpoint> &eps = type.get_endpoints();
+       const vector<TrackType::Endpoint> &eps = type.get_endpoints();
        if(epi>=eps.size())
-               throw InvalidParameterValue("Endpoint index out of range");
+               throw InvalidParameterValue("TrackType::Endpoint index out of range");
 
-       const Endpoint &ep = eps[epi];
+       const TrackType::Endpoint &ep = eps[epi];
 
        return rot+ep.dir;
 }
 
 bool Track::snap_to(Track &other, bool link)
 {
-       float limit = (link && !flex) ? 1e-6 : 1e-4;
-       const vector<Endpoint> &eps = type.get_endpoints();
-       const vector<Endpoint> &other_eps = other.get_type().get_endpoints();
+       float limit = (link && !flex && !other.get_flex()) ? 1e-6 : 1e-4;
+       const vector<TrackType::Endpoint> &eps = type.get_endpoints();
+       const vector<TrackType::Endpoint> &other_eps = other.get_type().get_endpoints();
 
        for(unsigned i=0; i<eps.size(); ++i)
        {
@@ -184,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)
                                {
@@ -211,7 +244,7 @@ bool Track::snap_to(Track &other, bool link)
 
 bool Track::snap(Point &pt, float &d) const
 {
-       const vector<Endpoint> &eps = type.get_endpoints();
+       const vector<TrackType::Endpoint> &eps = type.get_endpoints();
 
        for(unsigned i=0; i<eps.size(); ++i)
        {
@@ -260,105 +293,36 @@ 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");
-}
-
-Point Track::get_point(unsigned epi, unsigned path, float d) const
+TrackPoint Track::get_point(unsigned epi, unsigned path, float d) const
 {
-       const vector<Endpoint> &eps = type.get_endpoints();
-       if(epi>=eps.size())
-               throw InvalidParameterValue("Endpoint index out of range");
+       TrackPoint p = type.get_point(epi, path, d);
+       float c = cos(rot);
+       float s = sin(rot);
 
-       float x = eps[epi].pos.x;
-       float y = eps[epi].pos.y;
-       float z = 0;
-       float slope_norm = 0;
-       if(eps.size()==2)
+       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)
        {
-               slope_norm = slope/type.get_total_length();
-               if(epi==1)
+               float len = type.get_path_length(path);
+               float grade = slope/len;
+               if(epi==0)
                {
-                       z = slope;
-                       slope_norm = -slope_norm;
+                       p.pos.z += grade*d;
+                       p.grade = grade;
                }
-       }
-
-       const vector<TrackPart> &parts = type.get_parts();
-       const TrackPart *last_part = 0;
-       while(1)
-       {
-               for(vector<TrackPart>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
+               else
                {
-                       if((eps[epi].paths&(1<<path)) && i->path!=path)
-                               continue;
-                       if(&*i==last_part)
-                               continue;
-
-                       vector<Endpoint> part_eps;
-                       i->collect_endpoints(part_eps);
-                       for(unsigned j=0; j<part_eps.size(); ++j)
-                       {
-                               float dx = part_eps[j].pos.x-x;
-                               float dy = part_eps[j].pos.y-y;
-                               if(dx*dx+dy*dy<1e-6)
-                               {
-                                       float plen = i->length;
-                                       if(i->radius)
-                                               plen *= abs(i->radius);
-                                       if(d<plen)
-                                       {
-                                               z += d*slope_norm;
-                                               if(j==1)
-                                                       d = plen-d;
-                                               Point p = i->get_point(d);
-                                               float c = cos(rot);
-                                               float s = sin(rot);
-                                               return Point(pos.x+c*p.x-s*p.y, pos.y+c*p.y+s*p.x, pos.z+z);
-                                       }
-                                       else if(part_eps.size()>1)
-                                       {
-                                               d -= plen;
-                                               x = part_eps[1-j].pos.x;
-                                               y = part_eps[1-j].pos.y;
-                                               z += plen*slope_norm;
-                                               last_part = &*i;
-                                               i = parts.begin();
-                                               break;
-                                       }
-                                       else
-                                               return pos;
-                               }
-                       }
+                       p.pos.z += slope-grade*d;
+                       p.grade = -grade;
                }
-
-               if(!last_part)
-                       throw Exception("Internal error (Endpoint does not match any part)");
-               else
-                       return pos;
        }
+
+       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