Make vehicles aware of which train they are in

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

diff --git a/source/designer/routebar.cpp b/source/designer/routebar.cpp
index 2cc9058f0638a4cc19c09d8d7eef19ea59cdb63b..9726b2e88f8c853a05f995483e68eafefe67cc4f 100644 (file)
--- a/source/designer/routebar.cpp
+++ b/source/designer/routebar.cpp
@@ -1,4 +1,4 @@
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include "libr2c2/route.h"
 #include "designer.h"
 #include "routebar.h"
@@ -8,11 +8,10 @@ using namespace Msp;
 using namespace R2C2;
 
 Routebar::Routebar(Designer &d):
-       Toolbar("Route", 370),
+       Toolbar("Route"),
        designer(d)
 {
        pnl_content->add(*(drp_routes = new GLtk::Dropdown));
-       drp_routes->set_geometry(GLtk::Geometry(0, 10, 250, 20));
        drp_routes->set_tooltip("Select route to edit");
        drp_routes->append("(new route)");
        drp_routes->signal_item_selected.connect(sigc::mem_fun(this, &Routebar::route_selected));
@@ -20,25 +19,22 @@ Routebar::Routebar(Designer &d):
        GLtk::Button *btn;
 
        pnl_content->add(*(btn = new GLtk::Button("Del")));
-       btn->set_geometry(GLtk::Geometry(250, 10, 40, 24));
        btn->set_style("red");
        btn->set_tooltip("Delete the current route");
        btn->signal_clicked.connect(sigc::mem_fun(this, &Routebar::delete_route_clicked));
 
        pnl_content->add(*(btn = new GLtk::Button("Name")));
-       btn->set_geometry(GLtk::Geometry(290, 10, 40, 24));
        btn->set_tooltip("Rename the current route");
        btn->signal_clicked.connect(sigc::mem_fun(&designer, &Designer::rename_route));
 
        pnl_content->add(*(btn = new GLtk::Button("Add")));
-       btn->set_geometry(GLtk::Geometry(330, 10, 40, 24));
        btn->set_tooltip("Add selected tracks to current route (A)");
        btn->signal_clicked.connect(sigc::mem_fun(&designer, &Designer::add_selection_to_route));
 
-       designer.get_layout().signal_route_added.connect(sigc::mem_fun(this, &Routebar::route_added));
-       designer.get_layout().signal_route_removed.connect(sigc::hide(sigc::mem_fun(this, &Routebar::update_routes)));
+       designer.get_layout().signal_track_chain_added.connect(sigc::mem_fun(this, &Routebar::track_chain_added));
+       designer.get_layout().signal_track_chain_removed.connect(sigc::hide(sigc::mem_fun(this, &Routebar::update_routes)));
 
-       const set<Route *> &routes = designer.get_layout().get_routes();
+       const set<Route *> &routes = designer.get_layout().get_all<Route>();
        for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i)
                (*i)->signal_name_changed.connect(sigc::hide(sigc::mem_fun(this, &Routebar::update_routes)));
 
@@ -50,8 +46,8 @@ void Routebar::route_selected(unsigned index, const string &)
        if(index==drp_routes->get_n_items()-1)
        {
                Layout &rlayout = designer.get_layout();
-               const set<Route *> &routes = rlayout.get_routes();
                Route *route = new Route(rlayout);
+               const set<Route *> &routes = rlayout.get_all<Route>();
                route->set_name(format("Route %d", routes.size()));
                designer.edit_route(route);
 
@@ -64,7 +60,7 @@ void Routebar::route_selected(unsigned index, const string &)
        }
        else
        {
-               const set<Route *> &routes = designer.get_layout().get_routes();
+               const set<Route *> &routes = designer.get_layout().get_all<Route>();
                set<Route *>::const_iterator i = routes.begin();
                advance(i, index);
                designer.edit_route(*i);
@@ -78,16 +74,19 @@ void Routebar::delete_route_clicked()
        delete route;
 }
 
-void Routebar::route_added(Route &r)
+void Routebar::track_chain_added(TrackChain &tc)
 {
-       r.signal_name_changed.connect(sigc::hide(sigc::mem_fun(this, &Routebar::update_routes)));
-       update_routes();
+       if(Route *r = dynamic_cast<Route *>(&tc))
+       {
+               r->signal_name_changed.connect(sigc::hide(sigc::mem_fun(this, &Routebar::update_routes)));
+               update_routes();
+       }
 }
 
 void Routebar::update_routes()
 {
        drp_routes->clear();
-       const set<Route *> &routes = designer.get_layout().get_routes();
+       const set<Route *> &routes = designer.get_layout().get_all<Route>();
        int selected = -1;
        unsigned n = 0;
        for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i, ++n)