-/* $Id$
-
-This file is part of the MSP Märklin suite
-Copyright © 2009 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
#include <gtkmm/box.h>
#include <gtkmm/liststore.h>
-#include "libmarklin/locotype.h"
+#include "remote.h"
#include "trainpanel.h"
using namespace std;
-TrainPanel::TrainPanel(Marklin::Client &c, Marklin::NetTrain &t):
+TrainPanel::TrainPanel(Remote &r, R2C2::Client &c, R2C2::NetTrain &t):
+ remote(r),
client(c),
train(t)
{
train.signal_name_changed.connect(sigc::mem_fun(this, &TrainPanel::name_changed));
- train.signal_speed_changed.connect(sigc::mem_fun(this, &TrainPanel::speed_changed));
- train.signal_reverse_changed.connect(sigc::mem_fun(this, &TrainPanel::reverse_changed));
+ train.signal_control_changed.connect(sigc::mem_fun(this, &TrainPanel::control_changed));
train.signal_function_changed.connect(sigc::mem_fun(this, &TrainPanel::function_changed));
train.signal_route_changed.connect(sigc::mem_fun(this, &TrainPanel::route_changed));
train.signal_status_changed.connect(sigc::mem_fun(this, &TrainPanel::status_changed));
Gtk::HBox *hbox = new Gtk::HBox(false, 5);
vbox->add(*manage(hbox));
- hbox->add(*manage(scl_speed = new Gtk::HScale));
+ hbox->pack_start(*manage(scl_speed = new Gtk::HScale), true, true);
scl_speed->set_digits(0);
- scl_speed->set_range(0, 14);
- scl_speed->set_increments(1, 1);
+ scl_speed->set_range(0, 200);
+ scl_speed->set_increments(5, 5);
scl_speed->set_size_request(210, -1);
scl_speed->signal_value_changed().connect(sigc::mem_fun(this, &TrainPanel::ui_speed_changed));
- hbox->add(*manage(chk_reverse = new Gtk::CheckButton("Rev")));
+ hbox->pack_start(*manage(chk_reverse = new Gtk::CheckButton("Rev")), false, true);
chk_reverse->signal_toggled().connect(sigc::mem_fun(this, &TrainPanel::ui_reverse_changed));
Gtk::HBox *func_box = new Gtk::HBox(false, 5);
vbox->add(*manage(func_box));
- const std::map<unsigned, string> &funcs = train.get_loco_type().get_functions();
- for(std::map<unsigned, string>::const_iterator i=funcs.begin(); i!=funcs.end(); ++i)
+ const R2C2::VehicleType::FunctionMap &funcs = train.get_loco_type().get_functions();
+ for(R2C2::VehicleType::FunctionMap::const_iterator i=funcs.begin(); i!=funcs.end(); ++i)
{
Gtk::CheckButton *&chk = chk_funcs[i->first];
chk = new Gtk::CheckButton(i->second);
}
Glib::RefPtr<Gtk::ListStore> route_store = Gtk::ListStore::create(route_columns);
- vbox->add(*manage(cmb_route = new Gtk::ComboBox(route_store)));
+ vbox->add(*manage(cmb_route = new Gtk::ComboBox(static_cast<const Glib::RefPtr<Gtk::TreeModel> &>(route_store))));
cmb_route->pack_start(route_columns.name);
route_store->append();
const list<string> &routes = client.get_routes();
lbl_status->set_text(status);
}
-void TrainPanel::speed_changed(unsigned speed)
-{
- scl_speed->set_value(speed);
-}
-
-void TrainPanel::reverse_changed(bool rev)
+void TrainPanel::control_changed(const string &control, float value)
{
- chk_reverse->set_active(rev);
+ if(control=="speed")
+ {
+ // XXX It would be better to make the VehicleType give us the catalogue
+ scl_speed->set_value(value*3.6/remote.get_catalogue().get_scale());
+ }
+ else if(control=="reverse")
+ chk_reverse->set_active(value);
}
void TrainPanel::function_changed(unsigned func, bool set)
void TrainPanel::ui_speed_changed()
{
- train.set_speed(static_cast<unsigned>(scl_speed->get_value()));
+ float speed = scl_speed->get_value()/3.6*remote.get_catalogue().get_scale();
+ train.set_control("speed", speed);
}
void TrainPanel::ui_reverse_changed()
{
- train.set_reverse(chk_reverse->get_active());
+ if(train.get_control("speed"))
+ {
+ train.set_control("speed", 0);
+ chk_reverse->set_active(train.get_control("reverse"));
+ }
+ else
+ train.set_control("reverse", chk_reverse->get_active());
}
void TrainPanel::ui_function_changed(unsigned func)