X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fremote%2Ftrainpanel.cpp;h=7675b27f07e086c5ed6a258f2754598b9e4a2283;hb=7f81613ba3efdff6e05246738f739e1f914e1151;hp=45435d56fa1ebd4d8a65748a0843aecc1c00fa1b;hpb=378f04522aa762729c0d5651fb60ad7e4d8ba9f3;p=r2c2.git

diff --git a/source/remote/trainpanel.cpp b/source/remote/trainpanel.cpp
index 45435d5..7675b27 100644
--- a/source/remote/trainpanel.cpp
+++ b/source/remote/trainpanel.cpp
@@ -1,6 +1,6 @@
 /* $Id$
 
-This file is part of the MSP Märklin suite
+This file is part of R²C²
 Copyright © 2009-2010  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
@@ -12,7 +12,7 @@ Distributed under the GPL
 
 using namespace std;
 
-TrainPanel::TrainPanel(Remote &r, Marklin::Client &c, Marklin::NetTrain &t):
+TrainPanel::TrainPanel(Remote &r, R2C2::Client &c, R2C2::NetTrain &t):
 	remote(r),
 	client(c),
 	train(t)
@@ -32,14 +32,14 @@ TrainPanel::TrainPanel(Remote &r, Marklin::Client &c, Marklin::NetTrain &t):
 	Gtk::HBox *hbox = new Gtk::HBox(false, 5);
 	vbox->add(*manage(hbox));
 
-	hbox->add(*manage(scl_speed = new Gtk::HScale));
+	hbox->pack_start(*manage(scl_speed = new Gtk::HScale), true, true);
 	scl_speed->set_digits(0);
 	scl_speed->set_range(0, 200);
 	scl_speed->set_increments(5, 5);
 	scl_speed->set_size_request(210, -1);
 	scl_speed->signal_value_changed().connect(sigc::mem_fun(this, &TrainPanel::ui_speed_changed));
 
-	hbox->add(*manage(chk_reverse = new Gtk::CheckButton("Rev")));
+	hbox->pack_start(*manage(chk_reverse = new Gtk::CheckButton("Rev")), false, true);
 	chk_reverse->signal_toggled().connect(sigc::mem_fun(this, &TrainPanel::ui_reverse_changed));
 
 	Gtk::HBox *func_box = new Gtk::HBox(false, 5);
@@ -84,10 +84,11 @@ void TrainPanel::control_changed(const string &control, float value)
 {
 	if(control=="speed")
 	{
-		// XXX It would be better to make the LocoType give us the catalogue
-		scl_speed->set_value(abs(value)*3.6/remote.get_catalogue().get_scale());
-		chk_reverse->set_active(value<0);
+		// XXX It would be better to make the VehicleType give us the catalogue
+		scl_speed->set_value(value*3.6/remote.get_catalogue().get_scale());
 	}
+	else if(control=="reverse")
+		chk_reverse->set_active(value);
 }
 
 void TrainPanel::function_changed(unsigned func, bool set)
@@ -111,14 +112,18 @@ void TrainPanel::route_changed(const string &route)
 void TrainPanel::ui_speed_changed()
 {
 	float speed = scl_speed->get_value()/3.6*remote.get_catalogue().get_scale();
-	if(chk_reverse->get_active())
-		speed = -speed;
 	train.set_control("speed", speed);
 }
 
 void TrainPanel::ui_reverse_changed()
 {
-	train.set_control("speed", 0);
+	if(train.get_control("speed"))
+	{
+		train.set_control("speed", 0);
+		chk_reverse->set_active(train.get_control("reverse"));
+	}
+	else
+		train.set_control("reverse", chk_reverse->get_active());
 }
 
 void TrainPanel::ui_function_changed(unsigned func)