Keep track of real speed separately for each speed step

[r2c2.git] / source / engineer / mainpanel.cpp

diff --git a/source/engineer/mainpanel.cpp b/source/engineer/mainpanel.cpp
index 7e68c03d87ae7e6393d8b338510abedfe16851f9..08348d713a91982902c9122067f6d6b017732801 100644 (file)
--- a/source/engineer/mainpanel.cpp
+++ b/source/engineer/mainpanel.cpp
@@ -1,10 +1,19 @@
+/* $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 "engineer.h"
 #include "mainpanel.h"
 
+using namespace std;
 using namespace Msp;
 
 MainPanel::MainPanel(Engineer &e, GLtk::Resources &r):
+       Widget(r),
        Panel(r),
        engineer(e)
 {
@@ -13,7 +22,7 @@ MainPanel::MainPanel(Engineer &e, GLtk::Resources &r):
        GLtk::Button *btn;
 
        add(*(btn=new GLtk::Button(res, "Off")));
-       btn->set_geometry(GLtk::Geometry(10, 50, 40, 25));
+       btn->set_geometry(GLtk::Geometry(10, 53, 40, 25));
        btn->set_style("red");
        btn->signal_clicked.connect(sigc::mem_fun(this, &MainPanel::power_off));
 
@@ -22,7 +31,7 @@ MainPanel::MainPanel(Engineer &e, GLtk::Resources &r):
        ind_off->set_style("red");
 
        add(*(btn=new GLtk::Button(res, "On")));
-       btn->set_geometry(GLtk::Geometry(50, 50, 40, 25));
+       btn->set_geometry(GLtk::Geometry(50, 53, 40, 25));
        btn->set_style("green");
        btn->signal_clicked.connect(sigc::mem_fun(this, &MainPanel::power_on));
 
@@ -31,18 +40,29 @@ MainPanel::MainPanel(Engineer &e, GLtk::Resources &r):
        ind_on->set_style("green");
 
        add(*(btn=new GLtk::Button(res, "Quit")));
-       btn->set_geometry(GLtk::Geometry(150, 50, 40, 25));
+       btn->set_geometry(GLtk::Geometry(150, 53, 40, 25));
        btn->set_style("red");
        btn->signal_clicked.connect(sigc::mem_fun(this, &MainPanel::quit));
 
        add(*(btn=new GLtk::Button(res, "+Loc")));
-       btn->set_geometry(GLtk::Geometry(10, 10, 40, 25));
+       btn->set_geometry(GLtk::Geometry(90, 53, 40, 25));
        btn->signal_clicked.connect(sigc::mem_fun(this, &MainPanel::new_loc));
 
+       add(*(lbl_status=new GLtk::Label(res)));
+       lbl_status->set_geometry(GLtk::Geometry(10, 10, 180, 24));
+       lbl_status->set_style("digital");
+
        if(engineer.get_control().get_power())
                ind_on->set_active(true);
        else
                ind_off->set_active(true);
+
+       engineer.get_control().signal_power_event.connect(sigc::mem_fun(this, &MainPanel::power_event));
+}
+
+void MainPanel::set_status_text(const string &txt)
+{
+       lbl_status->set_text(txt);
 }
 
 void MainPanel::power_on()
@@ -61,10 +81,16 @@ void MainPanel::power_off()
 
 void MainPanel::new_loc()
 {
-       engineer.add_train(0);
+       engineer.add_train();
 }
 
 void MainPanel::quit()
 {
        engineer.quit();
 }
+
+void MainPanel::power_event(bool p)
+{
+       ind_on->set_active(p);
+       ind_off->set_active(!p);
+}