Separate train routing logic to a class derived from TrainAI

[r2c2.git] / source / engineer / trainpanel.cpp

diff --git a/source/engineer/trainpanel.cpp b/source/engineer/trainpanel.cpp
index 813a53417452b43807650df9035e1b2ad34227b3..97592be1bed92dc2547c5fb79ca3eb2399ca38f2 100644 (file)
--- a/source/engineer/trainpanel.cpp
+++ b/source/engineer/trainpanel.cpp
@@ -1,15 +1,9 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2006-2011  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #include <cmath>
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include "libr2c2/aicontrol.h"
 #include "libr2c2/timetable.h"
 #include "libr2c2/trackiter.h"
+#include "libr2c2/trainrouter.h"
 #include "libr2c2/vehicletype.h"
 #include "engineer.h"
 #include "routeselect.h"
@@ -25,6 +19,7 @@ using namespace R2C2;
 TrainPanel::TrainPanel(Engineer &e, Train &t):
        engineer(e),
        train(t),
+       status(train),
        expanded(false)
 {
        set_size(200, 65);
@@ -71,20 +66,27 @@ TrainPanel::TrainPanel(Engineer &e, Train &t):
        pnl_extra->set_geometry(GLtk::Geometry(0, 10, geom.w, 135));
        pnl_extra->set_visible(false);
 
-       const Route *route = train.get_route();
+       TrainRouter *router = dynamic_cast<TrainRouter *>(train.get_tagged_ai("router"));
+       if(!router)
+       {
+               router = new TrainRouter(train);
+               router->set_tag("router");
+       }
+
+       const Route *route = router->get_route();
        pnl_extra->add(*(lbl_route = new GLtk::Label((route ? route->get_name() : "Free run"))));
        lbl_route->set_style("digital");
        lbl_route->set_geometry(GLtk::Geometry(10, 85, geom.w-20, 20));
-       train.signal_route_changed.connect(sigc::mem_fun(this, &TrainPanel::train_route_changed));
+       router->signal_route_changed.connect(sigc::mem_fun(this, &TrainPanel::train_route_changed));
 
-       pnl_extra->add(*(lbl_status = new GLtk::Label(train.get_status())));
+       pnl_extra->add(*(lbl_status = new GLtk::Label(status.get_status())));
        lbl_status->set_style("digital");
        lbl_status->set_geometry(GLtk::Geometry(10, 60, geom.w-20, 20));
-       train.signal_status_changed.connect(sigc::mem_fun(this, &TrainPanel::train_status_changed));
+       status.signal_changed.connect(sigc::mem_fun(this, &TrainPanel::train_status_changed));
 
-       const map<unsigned, string> &funcs = train.get_locomotive_type().get_functions();
+       const VehicleType::FunctionMap &funcs = train.get_locomotive_type().get_functions();
        unsigned x = 10;
-       for(map<unsigned, string>::const_iterator i=funcs.begin(); i!=funcs.end(); ++i, x+=36)
+       for(VehicleType::FunctionMap::const_iterator i=funcs.begin(); i!=funcs.end(); ++i, x+=36)
        {
                string fname = i->second;
                fname[0] = toupper(fname[0]);
@@ -157,7 +159,7 @@ void TrainPanel::ai_event(const TrainAI::Message &msg)
                lbl_speed->set_text(format("%3.0f", speed));
        }
        else if(msg.type=="reverse-changed")
-               tgl_forward->set_value(msg.value.value<bool>());
+               tgl_forward->set_value(!msg.value.value<bool>());
 }
 
 void TrainPanel::train_function_changed(unsigned func, bool value)
@@ -282,6 +284,7 @@ void TrainPanel::go_to(Track *track, unsigned)
 {
        pick_conn.disconnect();
 
-       if(!train.go_to(*track))
+       TrainRouter *router = dynamic_cast<TrainRouter *>(train.get_tagged_ai("router"));
+       if(!router || !router->go_to(*track))
                engineer.set_status("Could not set route");
 }