X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Ftrainpanel.cpp;h=250b283c23990ead07f5e8114f3f057f7d39e567;hb=a6a65f32fdf1b0eae00bfcafa70dbca5391cb09e;hp=a01df557c0c1fe3f126defd63c65a9443ba8d8d4;hpb=a73b245826e8c1bc1f1394e9aa21618f8f31a6c5;p=r2c2.git

diff --git a/source/engineer/trainpanel.cpp b/source/engineer/trainpanel.cpp
index a01df55..250b283 100644
--- a/source/engineer/trainpanel.cpp
+++ b/source/engineer/trainpanel.cpp
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of the MSP Märklin suite
-Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2009 Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
@@ -9,7 +9,9 @@ Distributed under the GPL
 #include <msp/strings/formatter.h>
 #include "libmarklin/locomotive.h"
 #include "engineer.h"
+#include "routeselect.h"
 #include "trainpanel.h"
+#include "trainproperties.h"
 
 using namespace std;
 using namespace Msp;
@@ -21,7 +23,7 @@ TrainPanel::TrainPanel(Engineer &e, const GLtk::Resources &r, Train &t):
 	engineer(e),
 	train(t)
 {
-	set_size(200, 145);
+	set_size(200, 170);
 
 	add(*(lbl_addr=new GLtk::Label(res, format("%2d", train.get_locomotive().get_address()))));
 	lbl_addr->set_style("digital");
@@ -35,7 +37,7 @@ TrainPanel::TrainPanel(Engineer &e, const GLtk::Resources &r, Train &t):
 	add(*(lbl_speed=new GLtk::Label(res, format("%2d", train.get_locomotive().get_speed()))));
 	lbl_speed->set_style("digital");
 	lbl_speed->set_geometry(GLtk::Geometry(10, geom.h-58, 35, 24));
-	train.get_locomotive().signal_speed_changed.connect(sigc::mem_fun(this, &TrainPanel::loco_speed_changed));
+	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));
@@ -48,6 +50,12 @@ TrainPanel::TrainPanel(Engineer &e, const GLtk::Resources &r, Train &t):
 	tgl_forward->set_geometry(GLtk::Geometry(geom.w-30, geom.h-59, 20, 27));
 	tgl_forward->set_value(!train.get_locomotive().get_reverse());
 	tgl_forward->signal_toggled.connect(sigc::mem_fun(this, &TrainPanel::forward_toggled));
+	train.get_locomotive().signal_reverse_changed.connect(sigc::mem_fun(this, &TrainPanel::train_reverse_changed));
+
+	add(*(lbl_route=new GLtk::Label(res, "Free run")));
+	lbl_route->set_style("digital");
+	lbl_route->set_geometry(GLtk::Geometry(10, 58, geom.w-20, 24));
+	train.signal_route_changed.connect(sigc::mem_fun(this, &TrainPanel::train_route_changed));
 
 	add(*(lbl_status=new GLtk::Label(res, train.get_status())));
 	lbl_status->set_style("digital");
@@ -75,6 +83,7 @@ TrainPanel::TrainPanel(Engineer &e, const GLtk::Resources &r, Train &t):
 
 	add(*(btn=new GLtk::Button(res, "Edit")));
 	btn->set_geometry(GLtk::Geometry(geom.w-50, 10, 40, 24));
+	btn->signal_clicked.connect(sigc::mem_fun(this, &TrainPanel::edit_clicked));
 
 	add(*(btn=new GLtk::Button(res, "Place")));
 	btn->set_geometry(GLtk::Geometry(geom.w-90, 10, 40, 24));
@@ -82,6 +91,10 @@ TrainPanel::TrainPanel(Engineer &e, const GLtk::Resources &r, Train &t):
 
 	add(*(btn=new GLtk::Button(res, "GoTo")));
 	btn->set_geometry(GLtk::Geometry(geom.w-130, 10, 40, 24));
+
+	add(*(btn=new GLtk::Button(res, "Route")));
+	btn->set_geometry(GLtk::Geometry(geom.w-170, 10, 40, 24));
+	btn->signal_clicked.connect(sigc::mem_fun(this, &TrainPanel::route_clicked));
 }
 
 void TrainPanel::speed_slider_changed(double v)
@@ -89,9 +102,15 @@ void TrainPanel::speed_slider_changed(double v)
 	train.set_speed(static_cast<unsigned>(v));
 }
 
-void TrainPanel::loco_speed_changed(unsigned speed)
+void TrainPanel::train_speed_changed(unsigned speed)
 {
 	lbl_speed->set_text(format("%2d", speed));
+	sld_speed->set_value(speed);
+}
+
+void TrainPanel::train_reverse_changed(bool reverse)
+{
+	tgl_forward->set_value(!reverse);
 }
 
 void TrainPanel::loco_function_changed(unsigned func, bool value)
@@ -101,6 +120,14 @@ void TrainPanel::loco_function_changed(unsigned func, bool value)
 		i->second->set_value(value);
 }
 
+void TrainPanel::train_route_changed(const Route *r)
+{
+	if(r)
+		lbl_route->set_text(r->get_name());
+	else
+		lbl_route->set_text("Free run");
+}
+
 void TrainPanel::train_status_changed(const string &s)
 {
 	lbl_status->set_text(s);
@@ -111,6 +138,22 @@ void TrainPanel::place_clicked()
 	engineer.place_train(train);
 }
 
+void TrainPanel::edit_clicked()
+{
+	TrainProperties *dialog = new TrainProperties(engineer, res, &train);
+	engineer.get_root().add(*dialog);
+	dialog->set_position(geom.x+geom.w, geom.y+geom.h-dialog->get_geometry().h);
+	dialog->set_visible(true);
+}
+
+void TrainPanel::route_clicked()
+{
+	RouteSelect *dialog = new RouteSelect(engineer, res, train);
+	engineer.get_root().add(*dialog);
+	dialog->set_position(geom.x+geom.w, geom.y+geom.h-dialog->get_geometry().h);
+	dialog->set_visible(true);
+}
+
 void TrainPanel::forward_toggled(bool value)
 {
 	train.set_reverse(!value);