X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Ftrainpanel.cpp;h=51e7a88fe8e820f54b76e03a1a0f94749c170365;hb=34f8bf04e4bdffefeceea59b186386b51c542b9d;hp=813a53417452b43807650df9035e1b2ad34227b3;hpb=e8d06e16ab1679eb87e21cbfa788eea02144927d;p=r2c2.git diff --git a/source/engineer/trainpanel.cpp b/source/engineer/trainpanel.cpp index 813a534..51e7a88 100644 --- a/source/engineer/trainpanel.cpp +++ b/source/engineer/trainpanel.cpp @@ -25,6 +25,7 @@ using namespace R2C2; TrainPanel::TrainPanel(Engineer &e, Train &t): engineer(e), train(t), + status(train), expanded(false) { set_size(200, 65); @@ -77,10 +78,10 @@ TrainPanel::TrainPanel(Engineer &e, Train &t): 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 &funcs = train.get_locomotive_type().get_functions(); unsigned x = 10; @@ -157,7 +158,7 @@ void TrainPanel::ai_event(const TrainAI::Message &msg) lbl_speed->set_text(format("%3.0f", speed)); } else if(msg.type=="reverse-changed") - tgl_forward->set_value(msg.value.value()); + tgl_forward->set_value(!msg.value.value()); } void TrainPanel::train_function_changed(unsigned func, bool value)