X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Ftrainpanel.cpp;h=b47093468cac16197a4bd890fe588f4010efb902;hb=38fb8d56efde037a71c46a58bda314655e68ab6c;hp=d46bd9d4756ca8c229eb92e7a3df64aadab87ae1;hpb=06c100aacb559fbbe7380e15981c4772092c269b;p=r2c2.git

diff --git a/source/engineer/trainpanel.cpp b/source/engineer/trainpanel.cpp
index d46bd9d..b470934 100644
--- a/source/engineer/trainpanel.cpp
+++ b/source/engineer/trainpanel.cpp
@@ -1,8 +1,17 @@
+/* $Id$
+
+This file is part of the MSP Märklin suite
+Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa
+Distributed under the GPL
+*/
+
 #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;
 
@@ -11,28 +20,59 @@ TrainPanel::TrainPanel(Engineer &e, const GLtk::Resources &r, Train &t):
 	engineer(e),
 	train(t)
 {
-	set_size(200, 100);
+	set_size(200, 172);
+
+	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(*(lbl_name=new GLtk::Label(res, train.get_name())));
 	lbl_name->set_style("digital");
-	lbl_name->set_geometry(GLtk::Geometry(10, geom.h-34, 140, 24));
+	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));
 
-	GLtk::Button *btn;
-
-	add(*(btn=new GLtk::Button(res, "Name")));
-	btn->set_geometry(GLtk::Geometry(150, geom.h-34, 40, 24));
-
 	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, " 0")));
+	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-75, 36, 24));
+	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));
+
+	GLtk::Button *btn;
+
+	const map<unsigned, string> &funcs = train.get_locomotive().get_type().get_functions();
+	unsigned x = 10;
+	for(map<unsigned, string>::const_iterator i=funcs.begin(); i!=funcs.end(); ++i, x+=40)
+	{
+		string fname = i->second;
+		fname[0] = toupper(fname[0]);
+		add(*(btn=new GLtk::Button(res, fname)));
+		btn->set_geometry(GLtk::Geometry(x, 68, 40, 24));
+		btn->signal_clicked.connect(sigc::bind(sigc::mem_fun(this, &TrainPanel::func_clicked), i->first));
+
+		GLtk::Indicator *ind = new GLtk::Indicator(res);
+		add(*ind);
+		ind->set_geometry(GLtk::Geometry(x, 92, 40, 12));
+		ind->set_active(train.get_locomotive().get_function(i->first));
+		ind_funcs[i->first] = ind;
+	}
+	train.get_locomotive().signal_function_changed.connect(sigc::mem_fun(this, &TrainPanel::loco_function_changed));
+
+	add(*(lbl_status=new GLtk::Label(res, train.get_status())));
+	lbl_status->set_style("digital");
+	lbl_status->set_geometry(GLtk::Geometry(10, 39, geom.w-20, 24));
+	train.signal_status_changed.connect(sigc::mem_fun(this, &TrainPanel::train_status_changed));
+
+	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(geom.w-90, 10, 40, 24));
+	btn->signal_clicked.connect(sigc::mem_fun(this, &TrainPanel::place_clicked));
 }
 
 void TrainPanel::speed_slider_changed(double v)
@@ -44,3 +84,25 @@ void TrainPanel::loco_speed_changed(unsigned speed)
 {
 	lbl_speed->set_text(format("%2d", speed));
 }
+
+void TrainPanel::loco_function_changed(unsigned func, bool value)
+{
+	map<unsigned, GLtk::Indicator *>::iterator i = ind_funcs.find(func);
+	if(i!=ind_funcs.end())
+		i->second->set_active(value);
+}
+
+void TrainPanel::train_status_changed(const string &s)
+{
+	lbl_status->set_text(s);
+}
+
+void TrainPanel::place_clicked()
+{
+	engineer.place_train(train);
+}
+
+void TrainPanel::func_clicked(unsigned func)
+{
+	train.get_locomotive().set_function(func, !train.get_locomotive().get_function(func));
+}