X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fremote%2Ftrainpanel.cpp;h=cfe0c10fea9f609e8969acc9c8137dcedce3f655;hb=1ff06c5bc46a677fa389ef86c6b26664368f1653;hp=37d75afba7273e36c8bb496f5e688cc1bfffb65e;hpb=9ddcd066e37e4c72685817c042c30897786ece05;p=r2c2.git

diff --git a/source/remote/trainpanel.cpp b/source/remote/trainpanel.cpp
index 37d75af..cfe0c10 100644
--- a/source/remote/trainpanel.cpp
+++ b/source/remote/trainpanel.cpp
@@ -1,19 +1,18 @@
 /* $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
 */
 
 #include <gtkmm/box.h>
 #include <gtkmm/liststore.h>
-#include "libmarklin/locotype.h"
 #include "remote.h"
 #include "trainpanel.h"
 
 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)
@@ -85,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)
@@ -112,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)