#include <msp/gltk/button.h>
#include <msp/strings/formatter.h>
#include "libmarklin/locotype.h"
+#include "libmarklin/timetable.h"
#include "engineer.h"
#include "routeselect.h"
+#include "timetabledialog.h"
#include "trainpanel.h"
#include "trainproperties.h"
GLtk::Button *btn;
add(*(btn=new GLtk::Button(res, "Edit")));
- btn->set_geometry(GLtk::Geometry(geom.w-50, 10, 40, 24));
+ btn->set_geometry(GLtk::Geometry(geom.w-46, 10, 36, 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));
+ btn->set_geometry(GLtk::Geometry(geom.w-82, 10, 36, 24));
btn->signal_clicked.connect(sigc::mem_fun(this, &TrainPanel::place_clicked));
add(*(btn=new GLtk::Button(res, "GoTo")));
- btn->set_geometry(GLtk::Geometry(geom.w-130, 10, 40, 24));
+ btn->set_geometry(GLtk::Geometry(geom.w-118, 10, 36, 24));
btn->signal_clicked.connect(sigc::mem_fun(this, &TrainPanel::goto_clicked));
add(*(btn=new GLtk::Button(res, "Route")));
- btn->set_geometry(GLtk::Geometry(geom.w-170, 10, 40, 24));
+ btn->set_geometry(GLtk::Geometry(geom.w-154, 10, 36, 24));
btn->signal_clicked.connect(sigc::mem_fun(this, &TrainPanel::route_clicked));
+
+ add(*(btn=new GLtk::Button(res, "TTbl")));
+ btn->set_geometry(GLtk::Geometry(geom.w-190, 10, 36, 24));
+ btn->signal_clicked.connect(sigc::mem_fun(this, &TrainPanel::timetable_clicked));
}
void TrainPanel::speed_slider_changed(double value)
{
float speed = abs(value)/engineer.get_layout().get_catalogue().get_scale()*3.6;
sld_speed->set_value(speed);
- lbl_speed->set_text(format("%03.0f", speed));
+ lbl_speed->set_text(format("%3.0f", speed));
if(value)
tgl_forward->set_value(value>0);
}
pick_conn = engineer.signal_pick_done.connect(sigc::mem_fun(this, &TrainPanel::go_to));
}
+void TrainPanel::timetable_clicked()
+{
+ Timetable *timetable = train.get_timetable();
+ if(!timetable)
+ {
+ timetable = new Timetable(train);
+ train.set_timetable(timetable);
+ }
+
+ TimetableDialog *dialog = new TimetableDialog(res, *timetable);
+ engineer.get_root().add(*dialog);
+ dialog->set_position(geom.x+geom.w, geom.y+geom.h-dialog->get_geometry().h);
+}
+
void TrainPanel::forward_toggled(bool /*value*/)
{
train.set_control("speed", 0);