-/* $Id$
-
-This file is part of the MSP Märklin suite
-Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
#include <cmath>
-#include <msp/strings/formatter.h>
-#include "libmarklin/timetable.h"
-#include "libmarklin/trackiter.h"
-#include "libmarklin/vehicletype.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"
#include "timetabledialog.h"
using namespace std;
using namespace Msp;
-using namespace Marklin;
+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");
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]);
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)
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);
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)
{
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");
}