X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fremote%2Ftrainpanel.cpp;h=58dcd676a86d2d7af0c8e90a26abce6cba6706f7;hb=f7ab597d035a053311c1a8c5baa51b090262f045;hp=26963a0537d6200af841108449669d1eba32c31b;hpb=d15ac13f2e170f155b4bbd124df48400c339b644;p=r2c2.git diff --git a/source/remote/trainpanel.cpp b/source/remote/trainpanel.cpp index 26963a0..58dcd67 100644 --- a/source/remote/trainpanel.cpp +++ b/source/remote/trainpanel.cpp @@ -1,139 +1,98 @@ -#include -#include -#include "remote.h" +#include +#include +#include +#include +#include +#include +#include +#include "network/client.h" #include "trainpanel.h" using namespace std; +using namespace Msp; +using namespace R2C2; -TrainPanel::TrainPanel(Remote &r, R2C2::Client &c, R2C2::NetTrain &t): - remote(r), - client(c), - train(t) +TrainPanel::TrainPanel(NetTrain &t): + train(t), + updating(false) { - train.signal_name_changed.connect(sigc::mem_fun(this, &TrainPanel::name_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)); - - set_label(train.get_name()); - - Gtk::VBox *vbox = new Gtk::VBox(false, 5); - add(*manage(vbox)); - vbox->set_border_width(5); + Loader::WidgetMap widgets; + DataFile::load(*this, "data/remote/trainpanel.ui", widgets); - Gtk::HBox *hbox = new Gtk::HBox(false, 5); - vbox->add(*manage(hbox)); + Msp::GLtk::Button *btn = dynamic_cast(get_item(widgets, "btn_forward")); + btn->signal_clicked.connect(sigc::bind(sigc::mem_fun(&train, &NetTrain::set_reverse), false)); + btn = dynamic_cast(get_item(widgets, "btn_reverse")); + btn->signal_clicked.connect(sigc::bind(sigc::mem_fun(&train, &NetTrain::set_reverse), true)); - hbox->pack_start(*manage(scl_speed = new Gtk::HScale), true, true); - scl_speed->set_digits(0); - 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)); + ind_forward = dynamic_cast(get_item(widgets, "ind_forward")); + ind_reverse = dynamic_cast(get_item(widgets, "ind_reverse")); - 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 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); - func_box->pack_start(*manage(chk), false, true); - chk->signal_toggled().connect(sigc::bind(sigc::mem_fun(this, &TrainPanel::ui_function_changed), i->first)); - } + sld_speed = dynamic_cast(get_item(widgets, "sld_speed")); + sld_speed->set_range(0, train.get_loco_type().get_maximum_speed()/train.get_client().get_catalogue().get_scale()*3.6); + sld_speed->signal_value_changed.connect(sigc::mem_fun(this, &TrainPanel::ui_speed_changed)); - Glib::RefPtr route_store = Gtk::ListStore::create(route_columns); - vbox->add(*manage(cmb_route = new Gtk::ComboBox(static_cast &>(route_store)))); - cmb_route->pack_start(route_columns.name); - route_store->append(); - const list &routes = client.get_routes(); - for(list::const_iterator i=routes.begin(); i!=routes.end(); ++i) - { - Gtk::TreeIter iter = route_store->append(); - (*iter)[route_columns.name] = *i; - } - cmb_route->signal_changed().connect(sigc::mem_fun(this, &TrainPanel::ui_route_changed)); - - vbox->add(*manage(lbl_status = new Gtk::Label)); - - show_all(); -} + lbl_speed = dynamic_cast(get_item(widgets, "lbl_speed")); -void TrainPanel::name_changed(const string &name) -{ - set_label(name); -} - -void TrainPanel::status_changed(const string &status) -{ - lbl_status->set_text(status); -} + lbl_status = dynamic_cast(get_item(widgets, "lbl_status")); + train.signal_status_changed.connect(sigc::mem_fun(this, &TrainPanel::status_changed)); + lbl_status->set_text(train.get_status()); -void TrainPanel::control_changed(const string &control, float value) -{ - if(control=="speed") + GLtk::Panel *pnl_functions = dynamic_cast(get_item(widgets, "pnl_functions")); + const VehicleType::FunctionMap &functions = train.get_loco_type().get_functions(); + GLtk::Column column(*pnl_functions->get_layout()); + for(VehicleType::FunctionMap::const_iterator i=functions.begin(); i!=functions.end(); ++i) { - // 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()); + GLtk::Toggle *tgl = new GLtk::Toggle(i->second); + pnl_functions->add(*tgl); + tgl->set_value(train.get_function(i->first)); + tgl->signal_toggled.connect(sigc::bind(sigc::mem_fun(this, &TrainPanel::ui_function_toggled), i->first)); + tgl_functions[i->first] = tgl; } - else if(control=="reverse") - chk_reverse->set_active(value); -} -void TrainPanel::function_changed(unsigned func, bool set) -{ - std::map::iterator i = chk_funcs.find(func); - if(i!=chk_funcs.end()) - i->second->set_active(set); + train.signal_target_speed_changed.connect(sigc::mem_fun(this, &TrainPanel::update_speed)); + update_speed(train.get_target_speed()); + train.signal_reverse_changed.connect(sigc::mem_fun(this, &TrainPanel::update_reverse)); + update_reverse(train.get_reverse()); } -void TrainPanel::route_changed(const string &route) +void TrainPanel::update_reverse(bool r) { - Gtk::TreeNodeChildren children = cmb_route->get_model()->children(); - for(Gtk::TreeIter i=children.begin(); i!=children.end(); ++i) - if((*i)[route_columns.name]==route) - { - cmb_route->set_active(i); - break; - } + ind_forward->set_active(!r); + ind_reverse->set_active(r); } -void TrainPanel::ui_speed_changed() +void TrainPanel::update_speed(float s) { - float speed = scl_speed->get_value()/3.6*remote.get_catalogue().get_scale(); - train.set_control("speed", speed); + SetFlag setf(updating); + float scale_speed = s/train.get_client().get_catalogue().get_scale()*3.6; + sld_speed->set_value(scale_speed); + lbl_speed->set_text(format("%3.0f", scale_speed)); } -void TrainPanel::ui_reverse_changed() +void TrainPanel::ui_speed_changed(float s) { - if(train.get_control("speed")) + if(!updating) { - train.set_control("speed", 0); - chk_reverse->set_active(train.get_control("reverse")); + float real_speed = s*train.get_client().get_catalogue().get_scale()/3.6; + train.set_target_speed(real_speed); } - else - train.set_control("reverse", chk_reverse->get_active()); } -void TrainPanel::ui_function_changed(unsigned func) +void TrainPanel::function_changed(unsigned f, bool a) { - std::map::iterator i = chk_funcs.find(func); - if(i!=chk_funcs.end()) - train.set_function(func, i->second->get_active()); + SetFlag setf(updating); + map::iterator i = tgl_functions.find(f); + if(i!=tgl_functions.end()) + get_item(tgl_functions, f)->set_value(a); } -void TrainPanel::ui_route_changed() +void TrainPanel::ui_function_toggled(bool a, unsigned f) { - Gtk::TreeIter iter = cmb_route->get_active(); - train.set_route(Glib::ustring((*iter)[route_columns.name])); + if(!updating) + train.set_function(f, a); } - -TrainPanel::RouteRecord::RouteRecord() +void TrainPanel::status_changed(const string &s) { - add(name); + lbl_status->set_text(s); }