X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Ftrainpanel.cpp;h=6685727663276642de5a1c0c3f56b920ca431906;hb=dc3b2bce73df40ea885a1960a825e5cd3a33c045;hp=dce1387f58540c604e3b8b45c4e661ace7d523a6;hpb=d27edb207810f0b4e44be8c3632d421faa5fed80;p=r2c2.git

diff --git a/source/engineer/trainpanel.cpp b/source/engineer/trainpanel.cpp
index dce1387..6685727 100644
--- a/source/engineer/trainpanel.cpp
+++ b/source/engineer/trainpanel.cpp
@@ -5,6 +5,7 @@ Copyright © 2006-2010  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
+#include <cmath>
 #include <msp/gltk/button.h>
 #include <msp/strings/formatter.h>
 #include "libmarklin/locotype.h"
@@ -25,6 +26,8 @@ TrainPanel::TrainPanel(Engineer &e, const GLtk::Resources &r, Train &t):
 {
 	set_size(200, 170);
 
+	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,23 +37,21 @@ 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_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_reverse());
+	tgl_forward->set_value(true);
 	tgl_forward->signal_toggled.connect(sigc::mem_fun(this, &TrainPanel::forward_toggled));
-	train.signal_reverse_changed.connect(sigc::mem_fun(this, &TrainPanel::train_reverse_changed));
 
 	const Route *route = train.get_route();
 	add(*(lbl_route=new GLtk::Label(res, (route ? route->get_name() : "Free run"))));
@@ -99,20 +100,24 @@ TrainPanel::TrainPanel(Engineer &e, const GLtk::Resources &r, Train &t):
 	btn->signal_clicked.connect(sigc::mem_fun(this, &TrainPanel::route_clicked));
 }
 
-void TrainPanel::speed_slider_changed(double v)
-{
-	train.set_speed(static_cast<unsigned>(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::train_function_changed(unsigned func, bool value)
@@ -163,9 +168,9 @@ void TrainPanel::goto_clicked()
 	pick_conn = engineer.signal_pick_done.connect(sigc::mem_fun(this, &TrainPanel::go_to));
 }
 
-void TrainPanel::forward_toggled(bool value)
+void TrainPanel::forward_toggled(bool /*value*/)
 {
-	train.set_reverse(!value);
+	train.set_control("speed", 0);
 }
 
 void TrainPanel::func_toggled(bool value, unsigned func)