btn->signal_clicked.connect(sigc::mem_fun(this, &TrainPanel::timetable_clicked));
}
-void TrainPanel::speed_slider_changed(double value)
-{
- 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_control_changed(const string &control, float value)
{
if(control=="speed")
{
- float speed = abs(value)/engineer.get_layout().get_catalogue().get_scale()*3.6;
+ float speed = 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);
}
+ else if(control=="reverse")
+ tgl_forward->set_value(value==0);
}
void TrainPanel::train_function_changed(unsigned func, bool value)
dialog->set_position(geom.x+geom.w, geom.y+geom.h-dialog->get_geometry().h);
}
-void TrainPanel::forward_toggled(bool /*value*/)
+void TrainPanel::speed_slider_changed(double value)
{
- train.set_control("speed", 0);
+ float speed = value/3.6*engineer.get_layout().get_catalogue().get_scale();
+ train.set_control("speed", speed);
+}
+
+void TrainPanel::forward_toggled(bool value)
+{
+ if(train.get_speed() || sld_speed->get_value())
+ {
+ train.set_control("speed", 0);
+ tgl_forward->set_value(!train.get_control("reverse"));
+ }
+ else
+ train.set_control("reverse", !value);
}
void TrainPanel::func_toggled(bool value, unsigned func)