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

diff --git a/source/engineer/trainpanel.cpp b/source/engineer/trainpanel.cpp
index d9a8c77..cd41c23 100644
--- a/source/engineer/trainpanel.cpp
+++ b/source/engineer/trainpanel.cpp
@@ -1,6 +1,10 @@
 #include <msp/gltk/button.h>
+#include <msp/strings/formatter.h>
+#include "libmarklin/locomotive.h"
+#include "engineer.h"
 #include "trainpanel.h"
 
+using namespace std;
 using namespace Msp;
 using namespace Marklin;
 
@@ -9,28 +13,59 @@ TrainPanel::TrainPanel(Engineer &e, const GLtk::Resources &r, Train &t):
 	engineer(e),
 	train(t)
 {
-	set_size(200, 100);
+	set_size(200, 131);
 
-	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, format("%2d", train.get_locomotive().get_address()))));
+	lbl_addr->set_style("digital");
+	lbl_addr->set_geometry(GLtk::Geometry(10, geom.h-34, 35, 24));
 
-	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));
+	sld_speed->set_geometry(GLtk::Geometry(50, geom.h-56, geom.w-60, 10));
 	sld_speed->set_range(0, 14);
 	sld_speed->set_step(1);
 	sld_speed->signal_value_changed.connect(sigc::mem_fun(this, &TrainPanel::speed_slider_changed));
 
+	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-63, 35, 24));
+	train.get_locomotive().signal_speed_changed.connect(sigc::mem_fun(this, &TrainPanel::loco_speed_changed));
+
+	add(*(lbl_status=new GLtk::Label(res, train.get_status())));
+	lbl_status->set_style("digital");
+	lbl_status->set_geometry(GLtk::Geometry(10, geom.h-92, geom.w-20, 24));
+	train.signal_status_changed.connect(sigc::mem_fun(this, &TrainPanel::train_status_changed));
+
+	GLtk::Button *btn;
+
+	add(*(btn=new GLtk::Button(res, "Edit")));
+	btn->set_geometry(GLtk::Geometry(geom.w-50, 10, 40, 24));
+
 	add(*(btn=new GLtk::Button(res, "Place")));
-	btn->set_geometry(GLtk::Geometry(150, geom.h-75, 40, 24));
+	btn->set_geometry(GLtk::Geometry(geom.w-90, 10, 40, 24));
+	btn->signal_clicked.connect(sigc::mem_fun(this, &TrainPanel::place_clicked));
 }
 
 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));
+}
+
+void TrainPanel::train_status_changed(const string &s)
+{
+	lbl_status->set_text(s);
+}
+
+void TrainPanel::place_clicked()
+{
+	engineer.place_train(train);
+}