Change terminology to better distinguish routes on the layout from paths across track...

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

diff --git a/source/libmarklin/tracktype.cpp b/source/libmarklin/tracktype.cpp
index 692b5625f1335c59fbc594ae11b1816520916b0d..c6757cb221b12b9a206bdf6b0295f13fb835c789 100644 (file)
--- a/source/libmarklin/tracktype.cpp
+++ b/source/libmarklin/tracktype.cpp
@@ -18,14 +18,14 @@ TrackType::TrackType(unsigned a):
 
 float TrackType::get_total_length() const
 {
-       return get_route_length(-1);
+       return get_path_length(-1);
 }
 
-float TrackType::get_route_length(int r) const
+float TrackType::get_path_length(int p) const
 {
        float len = 0;
        for(vector<TrackPart>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
-               if(r<0 || i->route==static_cast<unsigned>(r))
+               if(p<0 || i->path==static_cast<unsigned>(p))
                {
                        float l = i->length;
                        if(i->radius)
@@ -35,12 +35,12 @@ float TrackType::get_route_length(int r) const
        return len;
 }
 
-unsigned TrackType::get_n_routes() const
+unsigned TrackType::get_n_paths() const
 {
        unsigned n = 1;
        for(vector<TrackPart>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
-               if(i->route>=n)
-                       n = i->route+1;
+               if(i->path>=n)
+                       n = i->path+1;
        return n;
 }
 
@@ -67,7 +67,7 @@ void TrackType::collect_endpoints()
                                        da -= M_PI*2;
                                if(da<-3.1 || da>3.1)
                                        rm = true;
-                               i->routes |= j->routes;
+                               i->paths |= j->paths;
                                j = endpoints.erase(j);
                        }
                        else