X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Ftrainpanel.cpp;h=6685727663276642de5a1c0c3f56b920ca431906;hb=dc3b2bce73df40ea885a1960a825e5cd3a33c045;hp=250b283c23990ead07f5e8114f3f057f7d39e567;hpb=2fe7cbcb761487bc7409b93b372da6f8ab3c581e;p=r2c2.git diff --git a/source/engineer/trainpanel.cpp b/source/engineer/trainpanel.cpp index 250b283..6685727 100644 --- a/source/engineer/trainpanel.cpp +++ b/source/engineer/trainpanel.cpp @@ -1,13 +1,14 @@ /* $Id$ This file is part of the MSP Märklin suite -Copyright © 2006-2009 Mikkosoft Productions, Mikko Rasa +Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ +#include #include #include -#include "libmarklin/locomotive.h" +#include "libmarklin/locotype.h" #include "engineer.h" #include "routeselect.h" #include "trainpanel.h" @@ -25,7 +26,9 @@ TrainPanel::TrainPanel(Engineer &e, const GLtk::Resources &r, Train &t): { set_size(200, 170); - add(*(lbl_addr=new GLtk::Label(res, format("%2d", train.get_locomotive().get_address())))); + train.signal_control_changed.connect(sigc::mem_fun(this, &TrainPanel::train_control_changed)); + + add(*(lbl_addr=new GLtk::Label(res, format("%2d", train.get_address())))); lbl_addr->set_style("digital"); lbl_addr->set_geometry(GLtk::Geometry(10, geom.h-34, 35, 24)); @@ -34,25 +37,24 @@ TrainPanel::TrainPanel(Engineer &e, const GLtk::Resources &r, Train &t): lbl_name->set_geometry(GLtk::Geometry(45, geom.h-34, geom.w-55, 24)); train.signal_name_changed.connect(sigc::mem_fun(lbl_name, &GLtk::Label::set_text)); - add(*(lbl_speed=new GLtk::Label(res, format("%2d", train.get_locomotive().get_speed())))); + add(*(lbl_speed=new GLtk::Label(res, " 0"))); lbl_speed->set_style("digital"); lbl_speed->set_geometry(GLtk::Geometry(10, geom.h-58, 35, 24)); - train.signal_target_speed_changed.connect(sigc::mem_fun(this, &TrainPanel::train_speed_changed)); add(*(sld_speed=new GLtk::HSlider(res))); sld_speed->set_geometry(GLtk::Geometry(50, geom.h-51, geom.w-80, 10)); - sld_speed->set_range(0, 14); - sld_speed->set_step(1); + sld_speed->set_range(0, 200); + sld_speed->set_step(5); sld_speed->signal_value_changed.connect(sigc::mem_fun(this, &TrainPanel::speed_slider_changed)); add(*(tgl_forward=new GLtk::Toggle(res))); tgl_forward->set_text("Fwd"); tgl_forward->set_geometry(GLtk::Geometry(geom.w-30, geom.h-59, 20, 27)); - tgl_forward->set_value(!train.get_locomotive().get_reverse()); + tgl_forward->set_value(true); tgl_forward->signal_toggled.connect(sigc::mem_fun(this, &TrainPanel::forward_toggled)); - train.get_locomotive().signal_reverse_changed.connect(sigc::mem_fun(this, &TrainPanel::train_reverse_changed)); - add(*(lbl_route=new GLtk::Label(res, "Free run"))); + const Route *route = train.get_route(); + add(*(lbl_route=new GLtk::Label(res, (route ? route->get_name() : "Free run")))); lbl_route->set_style("digital"); lbl_route->set_geometry(GLtk::Geometry(10, 58, geom.w-20, 24)); train.signal_route_changed.connect(sigc::mem_fun(this, &TrainPanel::train_route_changed)); @@ -62,22 +64,22 @@ TrainPanel::TrainPanel(Engineer &e, const GLtk::Resources &r, Train &t): lbl_status->set_geometry(GLtk::Geometry(10, 34, geom.w-20, 24)); train.signal_status_changed.connect(sigc::mem_fun(this, &TrainPanel::train_status_changed)); - const map &funcs = train.get_locomotive().get_type().get_functions(); + const map &funcs = train.get_locomotive_type().get_functions(); unsigned x = 10; - for(map::const_iterator i=funcs.begin(); i!=funcs.end(); ++i, x+=35) + for(map::const_iterator i=funcs.begin(); i!=funcs.end(); ++i, x+=36) { string fname = i->second; fname[0] = toupper(fname[0]); GLtk::Toggle *tgl; add(*(tgl=new GLtk::Toggle(res))); tgl->set_text(fname); - tgl->set_geometry(GLtk::Geometry(x, geom.h-85, 35, 27)); - tgl->set_value(train.get_locomotive().get_function(i->first)); + tgl->set_geometry(GLtk::Geometry(x, geom.h-85, 36, 27)); + tgl->set_value(train.get_function(i->first)); tgl->signal_toggled.connect(sigc::bind(sigc::mem_fun(this, &TrainPanel::func_toggled), i->first)); tgl_funcs[i->first] = tgl; } - train.get_locomotive().signal_function_changed.connect(sigc::mem_fun(this, &TrainPanel::loco_function_changed)); + train.signal_function_changed.connect(sigc::mem_fun(this, &TrainPanel::train_function_changed)); GLtk::Button *btn; @@ -91,29 +93,34 @@ TrainPanel::TrainPanel(Engineer &e, const GLtk::Resources &r, Train &t): add(*(btn=new GLtk::Button(res, "GoTo"))); btn->set_geometry(GLtk::Geometry(geom.w-130, 10, 40, 24)); + btn->signal_clicked.connect(sigc::mem_fun(this, &TrainPanel::goto_clicked)); add(*(btn=new GLtk::Button(res, "Route"))); btn->set_geometry(GLtk::Geometry(geom.w-170, 10, 40, 24)); btn->signal_clicked.connect(sigc::mem_fun(this, &TrainPanel::route_clicked)); } -void TrainPanel::speed_slider_changed(double v) -{ - train.set_speed(static_cast(v)); -} - -void TrainPanel::train_speed_changed(unsigned speed) +void TrainPanel::speed_slider_changed(double value) { - lbl_speed->set_text(format("%2d", speed)); - sld_speed->set_value(speed); + float speed = value/3.6*engineer.get_layout().get_catalogue().get_scale(); + if(!tgl_forward->get_value()) + speed = -speed; + train.set_control("speed", speed); } -void TrainPanel::train_reverse_changed(bool reverse) +void TrainPanel::train_control_changed(const string &control, float value) { - tgl_forward->set_value(!reverse); + if(control=="speed") + { + float speed = abs(value)/engineer.get_layout().get_catalogue().get_scale()*3.6; + sld_speed->set_value(speed); + lbl_speed->set_text(format("%3.0f", speed)); + if(value) + tgl_forward->set_value(value>0); + } } -void TrainPanel::loco_function_changed(unsigned func, bool value) +void TrainPanel::train_function_changed(unsigned func, bool value) { map::iterator i = tgl_funcs.find(func); if(i!=tgl_funcs.end()) @@ -135,7 +142,8 @@ void TrainPanel::train_status_changed(const string &s) void TrainPanel::place_clicked() { - engineer.place_train(train); + engineer.pick(true); + pick_conn = engineer.signal_pick_done.connect(sigc::mem_fun(this, &TrainPanel::place)); } void TrainPanel::edit_clicked() @@ -154,12 +162,62 @@ void TrainPanel::route_clicked() dialog->set_visible(true); } -void TrainPanel::forward_toggled(bool value) +void TrainPanel::goto_clicked() { - train.set_reverse(!value); + engineer.pick(false); + pick_conn = engineer.signal_pick_done.connect(sigc::mem_fun(this, &TrainPanel::go_to)); +} + +void TrainPanel::forward_toggled(bool /*value*/) +{ + train.set_control("speed", 0); } void TrainPanel::func_toggled(bool value, unsigned func) { - train.get_locomotive().set_function(func, value); + train.set_function(func, value); +} + +void TrainPanel::place(Track *track, unsigned ep) +{ + pick_conn.disconnect(); + + Block &block = engineer.get_layout().get_block_by_track(*track); + + while(1) + { + const vector &eps = block.get_endpoints(); + bool ok = false; + for(unsigned i=0; (!ok && iget_links()[ep]; + ep = next->traverse(next->get_endpoint_by_link(*track), 0); + track = next; + if(!block.get_tracks().count(track)) + break; + } + } +} + +void TrainPanel::go_to(Track *track, unsigned) +{ + pick_conn.disconnect(); + + try + { + train.go_to(*track); + } + catch(const Exception &e) + { + engineer.set_status(e.what()); + } }