X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Ftrainpanel.cpp;h=be27cd4013512319ed62148544a4215ad3a3d3da;hb=52cbe8d99669f843f8f75c51128e2748584dd03a;hp=d9a8c7752bb8ff58467fc9110c8f1ba9001b7dd7;hpb=6c61179fe09af2f5366d50f10aadbf5f83438087;p=r2c2.git

diff --git a/source/engineer/trainpanel.cpp b/source/engineer/trainpanel.cpp
index d9a8c77..be27cd4 100644
--- a/source/engineer/trainpanel.cpp
+++ b/source/engineer/trainpanel.cpp
@@ -1,4 +1,6 @@
 #include <msp/gltk/button.h>
+#include <msp/strings/formatter.h>
+#include "libmarklin/locomotive.h"
 #include "trainpanel.h"
 
 using namespace Msp;
@@ -11,14 +13,14 @@ TrainPanel::TrainPanel(Engineer &e, const GLtk::Resources &r, Train &t):
 {
 	set_size(200, 100);
 
-	add(*(lbl_name=new GLtk::Label(res, "Train 1")));
-	lbl_name->set_style("digital");
-	lbl_name->set_geometry(GLtk::Geometry(10, geom.h-34, 140, 24));
-
-	GLtk::Button *btn;
+	add(*(lbl_addr=new GLtk::Label(res, lexical_cast(train.get_locomotive().get_address(), "%2d"))));
+	lbl_addr->set_style("digital");
+	lbl_addr->set_geometry(GLtk::Geometry(10, geom.h-34, 35, 34));
 
-	add(*(btn=new GLtk::Button(res, "Name")));
-	btn->set_geometry(GLtk::Geometry(150, geom.h-34, 40, 24));
+	add(*(lbl_name=new GLtk::Label(res, train.get_name())));
+	lbl_name->set_style("digital");
+	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(*(sld_speed=new GLtk::HSlider(res)));
 	sld_speed->set_geometry(GLtk::Geometry(10, geom.h-49, 180, 10));
@@ -26,11 +28,23 @@ TrainPanel::TrainPanel(Engineer &e, const GLtk::Resources &r, Train &t):
 	sld_speed->set_step(1);
 	sld_speed->signal_value_changed.connect(sigc::mem_fun(this, &TrainPanel::speed_slider_changed));
 
-	add(*(btn=new GLtk::Button(res, "Place")));
-	btn->set_geometry(GLtk::Geometry(150, geom.h-75, 40, 24));
+	add(*(lbl_speed=new GLtk::Label(res, " 0")));
+	lbl_speed->set_style("digital");
+	lbl_speed->set_geometry(GLtk::Geometry(10, geom.h-75, 35, 24));
+	train.get_locomotive().signal_speed_changed.connect(sigc::mem_fun(this, &TrainPanel::loco_speed_changed));
+
+	GLtk::Button *btn;
+
+	add(*(btn=new GLtk::Button(res, "Edit")));
+	btn->set_geometry(GLtk::Geometry(geom.w-50, 10, 40, 24));
 }
 
 void TrainPanel::speed_slider_changed(double v)
 {
 	train.set_speed(static_cast<unsigned>(v));
 }
+
+void TrainPanel::loco_speed_changed(unsigned speed)
+{
+	lbl_speed->set_text(format("%2d", speed));
+}