X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Ftrainpanel.cpp;h=922e3741e272183abad52382f4255ce08c6fbfe3;hb=fcaa883538f98bac71ba1a90f98950bb2aa08d88;hp=dce1387f58540c604e3b8b45c4e661ace7d523a6;hpb=d27edb207810f0b4e44be8c3632d421faa5fed80;p=r2c2.git diff --git a/source/engineer/trainpanel.cpp b/source/engineer/trainpanel.cpp index dce1387..922e374 100644 --- a/source/engineer/trainpanel.cpp +++ b/source/engineer/trainpanel.cpp @@ -5,13 +5,16 @@ Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ -#include +#include #include -#include "libmarklin/locotype.h" +#include "libmarklin/timetable.h" +#include "libmarklin/vehicletype.h" #include "engineer.h" #include "routeselect.h" +#include "timetabledialog.h" #include "trainpanel.h" #include "trainproperties.h" +#include "trainview.h" using namespace std; using namespace Msp; @@ -21,46 +24,61 @@ TrainPanel::TrainPanel(Engineer &e, const GLtk::Resources &r, Train &t): Widget(r), Panel(r), engineer(e), - train(t) + train(t), + expanded(false) { - set_size(200, 170); + set_size(200, 65); - add(*(lbl_addr=new GLtk::Label(res, format("%2d", train.get_address())))); + train.signal_control_changed.connect(sigc::mem_fun(this, &TrainPanel::train_control_changed)); + + add(*(pnl_basic = new GLtk::Panel(res))); + pnl_basic->set_style("group"); + pnl_basic->set_geometry(GLtk::Geometry(0, geom.h-58, geom.w, 45)); + + pnl_basic->add(*(lbl_addr = new GLtk::Label(res, format("%2d", train.get_address())))); lbl_addr->set_style("digital"); - lbl_addr->set_geometry(GLtk::Geometry(10, geom.h-34, 35, 24)); + lbl_addr->set_geometry(GLtk::Geometry(10, 28, 35, 20)); - add(*(lbl_name=new GLtk::Label(res, train.get_name()))); + pnl_basic->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)); + lbl_name->set_geometry(GLtk::Geometry(50, 28, geom.w-77, 20)); train.signal_name_changed.connect(sigc::mem_fun(lbl_name, &GLtk::Label::set_text)); - add(*(lbl_speed=new GLtk::Label(res, format("%2d", train.get_speed())))); + pnl_basic->add(*(lbl_speed = new GLtk::Label(res, " 0"))); lbl_speed->set_style("digital"); - lbl_speed->set_geometry(GLtk::Geometry(10, geom.h-58, 35, 24)); - train.signal_target_speed_changed.connect(sigc::mem_fun(this, &TrainPanel::train_speed_changed)); + lbl_speed->set_geometry(GLtk::Geometry(10, 3, 35, 20)); - add(*(sld_speed=new GLtk::HSlider(res))); - sld_speed->set_geometry(GLtk::Geometry(50, geom.h-51, geom.w-80, 10)); - sld_speed->set_range(0, 14); - sld_speed->set_step(1); + pnl_basic->add(*(sld_speed = new GLtk::HSlider(res))); + sld_speed->set_geometry(GLtk::Geometry(50, 8, geom.w-80, 10)); + sld_speed->set_range(0, 200); + sld_speed->set_step(5); sld_speed->signal_value_changed.connect(sigc::mem_fun(this, &TrainPanel::speed_slider_changed)); - add(*(tgl_forward=new GLtk::Toggle(res))); + pnl_basic->add(*(tgl_forward = new GLtk::Toggle(res))); tgl_forward->set_text("Fwd"); - tgl_forward->set_geometry(GLtk::Geometry(geom.w-30, geom.h-59, 20, 27)); - tgl_forward->set_value(!train.get_reverse()); + tgl_forward->set_geometry(GLtk::Geometry(geom.w-30, 0, 20, 27)); + tgl_forward->set_value(true); tgl_forward->signal_toggled.connect(sigc::mem_fun(this, &TrainPanel::forward_toggled)); - train.signal_reverse_changed.connect(sigc::mem_fun(this, &TrainPanel::train_reverse_changed)); + + pnl_basic->add(*(btn_expand = new GLtk::Button(res))); + btn_expand->set_style("arrow_down"); + btn_expand->set_geometry(GLtk::Geometry(geom.w-22, 28, 12, 20)); + btn_expand->signal_clicked.connect(sigc::mem_fun(this, &TrainPanel::expand_clicked)); + + add(*(pnl_extra = new GLtk::Panel(res))); + pnl_extra->set_style("group"); + pnl_extra->set_geometry(GLtk::Geometry(0, 10, geom.w, 135)); + pnl_extra->set_visible(false); const Route *route = train.get_route(); - add(*(lbl_route=new GLtk::Label(res, (route ? route->get_name() : "Free run")))); + pnl_extra->add(*(lbl_route = new GLtk::Label(res, (route ? route->get_name() : "Free run")))); lbl_route->set_style("digital"); - lbl_route->set_geometry(GLtk::Geometry(10, 58, geom.w-20, 24)); + lbl_route->set_geometry(GLtk::Geometry(10, 85, geom.w-20, 20)); train.signal_route_changed.connect(sigc::mem_fun(this, &TrainPanel::train_route_changed)); - add(*(lbl_status=new GLtk::Label(res, train.get_status()))); + pnl_extra->add(*(lbl_status = new GLtk::Label(res, train.get_status()))); lbl_status->set_style("digital"); - lbl_status->set_geometry(GLtk::Geometry(10, 34, geom.w-20, 24)); + lbl_status->set_geometry(GLtk::Geometry(10, 60, geom.w-20, 20)); train.signal_status_changed.connect(sigc::mem_fun(this, &TrainPanel::train_status_changed)); const map &funcs = train.get_locomotive_type().get_functions(); @@ -70,9 +88,9 @@ TrainPanel::TrainPanel(Engineer &e, const GLtk::Resources &r, Train &t): string fname = i->second; fname[0] = toupper(fname[0]); GLtk::Toggle *tgl; - add(*(tgl=new GLtk::Toggle(res))); + pnl_extra->add(*(tgl = new GLtk::Toggle(res))); tgl->set_text(fname); - tgl->set_geometry(GLtk::Geometry(x, geom.h-85, 36, 27)); + tgl->set_geometry(GLtk::Geometry(x, 108, 36, 27)); tgl->set_value(train.get_function(i->first)); tgl->signal_toggled.connect(sigc::bind(sigc::mem_fun(this, &TrainPanel::func_toggled), i->first)); @@ -82,37 +100,63 @@ TrainPanel::TrainPanel(Engineer &e, const GLtk::Resources &r, Train &t): GLtk::Button *btn; - add(*(btn=new GLtk::Button(res, "Edit"))); - btn->set_geometry(GLtk::Geometry(geom.w-50, 10, 40, 24)); + pnl_extra->add(*(btn = new GLtk::Button(res, "Edit"))); + btn->set_geometry(GLtk::Geometry(10, 30, 36, 25)); 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)); + pnl_extra->add(*(btn = new GLtk::Button(res, "Place"))); + btn->set_geometry(GLtk::Geometry(10, 0, 36, 25)); 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)); + pnl_extra->add(*(btn = new GLtk::Button(res, "Take"))); + btn->set_geometry(GLtk::Geometry(46, 0, 36, 25)); + btn->signal_clicked.connect(sigc::mem_fun(this, &TrainPanel::take_clicked)); + + pnl_extra->add(*(btn = new GLtk::Button(res, "GoTo"))); + btn->set_geometry(GLtk::Geometry(100, 0, 36, 25)); 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)); + pnl_extra->add(*(btn = new GLtk::Button(res, "Route"))); + btn->set_geometry(GLtk::Geometry(100, 30, 36, 25)); btn->signal_clicked.connect(sigc::mem_fun(this, &TrainPanel::route_clicked)); -} -void TrainPanel::speed_slider_changed(double v) -{ - train.set_speed(static_cast(v)); + pnl_extra->add(*(btn = new GLtk::Button(res, "TTbl"))); + btn->set_geometry(GLtk::Geometry(46, 30, 36, 25)); + btn->signal_clicked.connect(sigc::mem_fun(this, &TrainPanel::timetable_clicked)); + + pnl_extra->add(*(btn = new GLtk::Button(res, "View"))); + btn->set_geometry(GLtk::Geometry(geom.w-46, 30, 36, 25)); + btn->signal_clicked.connect(sigc::mem_fun(this, &TrainPanel::view_clicked)); } -void TrainPanel::train_speed_changed(unsigned speed) +void TrainPanel::expand(bool e) { - lbl_speed->set_text(format("%2d", speed)); - sld_speed->set_value(speed); + expanded = e; + pnl_extra->set_visible(expanded); + if(expanded) + { + set_size(geom.w, 205); + btn_expand->set_style("arrow_up"); + } + else + { + set_size(geom.w, 65); + btn_expand->set_style("arrow_down"); + } + pnl_basic->set_geometry(GLtk::Geometry(0, geom.h-58, geom.w, 45)); + engineer.rearrange_panels(); } -void TrainPanel::train_reverse_changed(bool reverse) +void TrainPanel::train_control_changed(const string &control, float value) { - tgl_forward->set_value(!reverse); + if(control=="speed") + { + float speed = value/engineer.get_layout().get_catalogue().get_scale()*3.6; + sld_speed->set_value(speed); + lbl_speed->set_text(format("%3.0f", speed)); + } + else if(control=="reverse") + tgl_forward->set_value(value==0); } void TrainPanel::train_function_changed(unsigned func, bool value) @@ -141,12 +185,16 @@ void TrainPanel::place_clicked() pick_conn = engineer.signal_pick_done.connect(sigc::mem_fun(this, &TrainPanel::place)); } +void TrainPanel::take_clicked() +{ + train.unplace(); +} + void TrainPanel::edit_clicked() { TrainProperties *dialog = new TrainProperties(engineer, res, &train); engineer.get_root().add(*dialog); dialog->set_position(geom.x+geom.w, geom.y+geom.h-dialog->get_geometry().h); - dialog->set_visible(true); } void TrainPanel::route_clicked() @@ -154,7 +202,6 @@ void TrainPanel::route_clicked() RouteSelect *dialog = new RouteSelect(engineer, res, train); engineer.get_root().add(*dialog); dialog->set_position(geom.x+geom.w, geom.y+geom.h-dialog->get_geometry().h); - dialog->set_visible(true); } void TrainPanel::goto_clicked() @@ -163,9 +210,47 @@ void TrainPanel::goto_clicked() 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::view_clicked() +{ + TrainView *dialog = new TrainView(engineer, train); + engineer.get_root().add(*dialog); + dialog->set_position(geom.x+geom.w, geom.y+geom.h-dialog->get_geometry().h); +} + +void TrainPanel::expand_clicked() +{ + expand(!expanded); +} + +void TrainPanel::speed_slider_changed(double value) +{ + float speed = value/3.6*engineer.get_layout().get_catalogue().get_scale(); + train.set_control("speed", speed); +} + void TrainPanel::forward_toggled(bool value) { - train.set_reverse(!value); + if(train.get_speed() || sld_speed->get_value()) + { + train.set_control("speed", 0); + tgl_forward->set_value(!train.get_control("reverse")); + } + else + train.set_control("reverse", !value); } void TrainPanel::func_toggled(bool value, unsigned func)