Don't give out a turnout ID that's already in use

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

diff --git a/source/libmarklin/track.cpp b/source/libmarklin/track.cpp
index 5f1ca438644eea5d094a09dcf61e019fe954f5f2..0a9f1ac83f8977f02935fd6f5838d93265a62278 100644 (file)
--- a/source/libmarklin/track.cpp
+++ b/source/libmarklin/track.cpp
@@ -168,11 +168,11 @@ int Track::get_endpoint_by_link(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);
@@ -185,11 +185,11 @@ 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;
 }
@@ -197,8 +197,8 @@ float Track::get_endpoint_direction(unsigned epi) const
 bool Track::snap_to(Track &other, bool link)
 {
        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();
+       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)
        {
@@ -244,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)
        {
@@ -293,37 +293,6 @@ 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);