-/* $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"
TrainPanel::TrainPanel(Engineer &e, Train &t):
engineer(e),
train(t),
+ status(train),
expanded(false)
{
set_size(200, 65);
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();
+ 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]);
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)