X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Ftrainpanel.cpp;h=08af8cc0c2cccca519d8050c465d58addd52dd89;hb=cc0ee0a5e71590960bc8cb7baee7a10ef09ce3f0;hp=590f1cd49e5537568b659c893e782a9370d46132;hpb=cf52013784607dc4d307bd1244c5346ee88336a4;p=r2c2.git

diff --git a/source/engineer/trainpanel.cpp b/source/engineer/trainpanel.cpp
index 590f1cd..08af8cc 100644
--- a/source/engineer/trainpanel.cpp
+++ b/source/engineer/trainpanel.cpp
@@ -8,8 +8,8 @@ Distributed under the GPL
 #include <cmath>
 #include <msp/gltk/button.h>
 #include <msp/strings/formatter.h>
-#include "libmarklin/locotype.h"
 #include "libmarklin/timetable.h"
+#include "libmarklin/vehicletype.h"
 #include "engineer.h"
 #include "routeselect.h"
 #include "timetabledialog.h"
@@ -106,24 +106,16 @@ TrainPanel::TrainPanel(Engineer &e, const GLtk::Resources &r, Train &t):
 	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)
@@ -188,9 +180,21 @@ void TrainPanel::timetable_clicked()
 	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)