Remove status from Train and turn it into a TrainAI

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

diff --git a/source/engineer/trainpanel.cpp b/source/engineer/trainpanel.cpp
index 5d237ecbca3b912b5297ea01748fcdb190891e71..51e7a88fe8e820f54b76e03a1a0f94749c170365 100644 (file)
--- a/source/engineer/trainpanel.cpp
+++ b/source/engineer/trainpanel.cpp
@@ -1,12 +1,13 @@
 /* $Id$
 
 This file is part of R²C²
-Copyright © 2006-2010  Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2011  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
 #include <cmath>
 #include <msp/strings/formatter.h>
+#include "libr2c2/aicontrol.h"
 #include "libr2c2/timetable.h"
 #include "libr2c2/trackiter.h"
 #include "libr2c2/vehicletype.h"
@@ -24,11 +25,13 @@ using namespace R2C2;
 TrainPanel::TrainPanel(Engineer &e, Train &t):
        engineer(e),
        train(t),
+       status(train),
        expanded(false)
 {
        set_size(200, 65);
 
-       train.signal_control_changed.connect(sigc::mem_fun(this, &TrainPanel::train_control_changed));
+       AIControl *ai = new AIControl(train);
+       ai->signal_event.connect(sigc::mem_fun(this, &TrainPanel::ai_event));
 
        add(*(pnl_basic = new GLtk::Panel));
        pnl_basic->set_style("group");
@@ -75,10 +78,10 @@ TrainPanel::TrainPanel(Engineer &e, Train &t):
        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));
 
-       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();
        unsigned x = 10;
@@ -146,16 +149,16 @@ void TrainPanel::expand(bool e)
        engineer.rearrange_panels();
 }
 
-void TrainPanel::train_control_changed(const string &control, float value)
+void TrainPanel::ai_event(const TrainAI::Message &msg)
 {
-       if(control=="speed")
+       if(msg.type=="target-speed-changed")
        {
-               float speed = value/engineer.get_layout().get_catalogue().get_scale()*3.6;
+               float speed = msg.value.value<float>()/engineer.get_layout().get_catalogue().get_scale()*3.6;
                sld_speed->set_value(speed);
                lbl_speed->set_text(format("%3.0f", speed));
        }
-       else if(control=="reverse")
-               tgl_forward->set_value(value==0);
+       else if(msg.type=="reverse-changed")
+               tgl_forward->set_value(!msg.value.value<bool>());
 }
 
 void TrainPanel::train_function_changed(unsigned func, bool value)
@@ -211,11 +214,11 @@ void TrainPanel::goto_clicked()
 
 void TrainPanel::timetable_clicked()
 {
-       Timetable *timetable = train.get_timetable();
+       Timetable *timetable = dynamic_cast<Timetable *>(train.get_tagged_ai("timetable"));
        if(!timetable)
        {
                timetable = new Timetable(train);
-               train.set_timetable(timetable);
+               timetable->set_tag("timetable");
        }
 
        TimetableDialog *dialog = new TimetableDialog(*timetable);
@@ -238,18 +241,12 @@ void TrainPanel::expand_clicked()
 void TrainPanel::speed_slider_changed(double value)
 {
        float speed = value/3.6*engineer.get_layout().get_catalogue().get_scale();
-       train.set_control("speed", speed);
+       train.ai_message(TrainAI::Message("set-target-speed", speed));
 }
 
 void TrainPanel::forward_toggled(bool value)
 {
-       if(train.get_speed() || sld_speed->get_value())
-       {
-               train.set_control("speed", 0);
-               tgl_forward->set_value(!train.get_control("reverse"));
-       }
-       else
-               train.set_control("reverse", !value);
+       train.ai_message(TrainAI::Message("set-reverse", !value));
 }
 
 void TrainPanel::func_toggled(bool value, unsigned func)