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

[r2c2.git] / source / designer / designer.cpp

diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp
index c5c274edbda8ccd3163b7f81ff30d777aed6cb15..a5bbc68e2b76fa8234cb367103652bb69f10d3a1 100644 (file)
--- a/source/designer/designer.cpp
+++ b/source/designer/designer.cpp
@@ -402,7 +402,7 @@ void Designer::key_press(unsigned code, unsigned mod, wchar_t)
        else if(key==Msp::Input::KEY_T)
        {
                Track *track = selection->get_track();
-               if(selection->size()==1 && track->get_type().get_n_routes()>1)
+               if(selection->size()==1 && track->get_type().get_n_paths()>1)
                {
                        ostringstream ss;
                        ss<<track->get_turnout_id();
@@ -419,7 +419,7 @@ void Designer::key_press(unsigned code, unsigned mod, wchar_t)
                int id = -1;
                for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
                {
-                       if((*i)->get_type().get_n_routes()==1)
+                       if((*i)->get_type().get_n_paths()==1)
                                ok = true;
                        if(static_cast<int>((*i)->get_sensor_id())!=id)
                        {
@@ -597,14 +597,14 @@ void Designer::render()
                        const map<unsigned, int> &turnouts = cur_route->get_turnouts();
                        for(set<const Track *>::const_iterator i=rtracks.begin(); i!=rtracks.end(); ++i)
                        {
-                               unsigned route = 0;
+                               unsigned path = 0;
                                if(unsigned tid=(*i)->get_turnout_id())
                                {
                                        map<unsigned, int>::const_iterator j = turnouts.find(tid);
                                        if(j!=turnouts.end())
-                                               route = j->second;
+                                               path = j->second;
                                }
-                               layout_3d->get_track(**i).render_route(route);
+                               layout_3d->get_track(**i).render_path(path);
                        }
                }
                manipulator->render();