-/* $Id$
-
-This file is part of the MSP Märklin suite
-Copyright © 2006-2009 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
-#include <msp/gltk/button.h>
-#include <msp/strings/formatter.h>
-#include "libmarklin/locomotive.h"
+#include <cmath>
+#include <msp/strings/format.h>
+#include "libr2c2/aicontrol.h"
+#include "libr2c2/trackiter.h"
+#include "libr2c2/trainrouter.h"
+#include "libr2c2/vehicletype.h"
#include "engineer.h"
+#include "routeselect.h"
#include "trainpanel.h"
#include "trainproperties.h"
+#include "trainview.h"
using namespace std;
using namespace Msp;
-using namespace Marklin;
+using namespace R2C2;
-TrainPanel::TrainPanel(Engineer &e, const GLtk::Resources &r, Train &t):
- Widget(r),
- Panel(r),
+TrainPanel::TrainPanel(Engineer &e, Train &t):
engineer(e),
- train(t)
+ train(t),
+ status(train),
+ expanded(false)
{
- set_size(200, 145);
+ set_size(200, 65);
+
+ AIControl *ai = new AIControl(train);
+ ai->signal_event.connect(sigc::mem_fun(this, &TrainPanel::ai_event));
+
+ add(*(pnl_basic = new GLtk::Panel));
+ pnl_basic->set_style("group");
+ pnl_basic->set_geometry(GLtk::Geometry(0, geom.h-58, geom.w, 45));
- add(*(lbl_addr=new GLtk::Label(res, format("%2d", train.get_locomotive().get_address()))));
+ pnl_basic->add(*(lbl_addr = new GLtk::Label(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(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_locomotive().get_speed()))));
+ pnl_basic->add(*(lbl_speed = new GLtk::Label(" 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));
+ 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));
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_locomotive().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));
- add(*(lbl_status=new GLtk::Label(res, train.get_status())));
+ pnl_basic->add(*(btn_expand = new GLtk::Button));
+ 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));
+ pnl_extra->set_style("group");
+ pnl_extra->set_geometry(GLtk::Geometry(0, 10, geom.w, 135));
+ pnl_extra->set_visible(false);
+
+ TrainRouter *router = train.get_ai_of_type<TrainRouter>();
+ if(!router)
+ router = new TrainRouter(train);
+
+ const Route *route = router->get_route();
+ pnl_extra->add(*(lbl_route = new GLtk::Label((route ? route->get_name() : "Free run"))));
+ lbl_route->set_style("digital");
+ lbl_route->set_geometry(GLtk::Geometry(10, 85, geom.w-20, 20));
+ router->signal_route_changed.connect(sigc::mem_fun(this, &TrainPanel::train_route_changed));
+
+ pnl_extra->add(*(lbl_status = new GLtk::Label(status.get_status())));
lbl_status->set_style("digital");
- lbl_status->set_geometry(GLtk::Geometry(10, 34, geom.w-20, 24));
- train.signal_status_changed.connect(sigc::mem_fun(this, &TrainPanel::train_status_changed));
+ lbl_status->set_geometry(GLtk::Geometry(10, 60, geom.w-20, 20));
+ status.signal_changed.connect(sigc::mem_fun(this, &TrainPanel::train_status_changed));
- const map<unsigned, string> &funcs = train.get_locomotive().get_type().get_functions();
+ const VehicleType::FunctionMap &funcs = train.get_locomotive_type().get_functions();
unsigned x = 10;
- for(map<unsigned, string>::const_iterator i=funcs.begin(); i!=funcs.end(); ++i, x+=35)
+ for(VehicleType::FunctionMap::const_iterator i=funcs.begin(); i!=funcs.end(); ++i, x+=36)
{
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));
tgl->set_text(fname);
- tgl->set_geometry(GLtk::Geometry(x, geom.h-85, 35, 27));
- tgl->set_value(train.get_locomotive().get_function(i->first));
+ 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));
tgl_funcs[i->first] = tgl;
}
- train.get_locomotive().signal_function_changed.connect(sigc::mem_fun(this, &TrainPanel::loco_function_changed));
+ train.signal_function_changed.connect(sigc::mem_fun(this, &TrainPanel::train_function_changed));
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("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("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("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("GoTo")));
+ btn->set_geometry(GLtk::Geometry(100, 0, 36, 25));
+ btn->signal_clicked.connect(sigc::mem_fun(this, &TrainPanel::goto_clicked));
+
+ pnl_extra->add(*(btn = new GLtk::Button("Route")));
+ btn->set_geometry(GLtk::Geometry(100, 30, 36, 25));
+ btn->signal_clicked.connect(sigc::mem_fun(this, &TrainPanel::route_clicked));
+
+ pnl_extra->add(*(btn = new GLtk::Button("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::speed_slider_changed(double v)
+void TrainPanel::expand(bool e)
{
- train.set_speed(static_cast<unsigned>(v));
+ 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_speed_changed(unsigned speed)
+void TrainPanel::ai_event(const TrainAI::Message &msg)
{
- lbl_speed->set_text(format("%2d", speed));
- sld_speed->set_value(speed);
+ if(msg.type=="target-speed-changed")
+ {
+ float speed = msg.value.value<float>()/engineer.get_layout().get_catalogue().get_scale()*3.6;
+ sld_speed->set_value(speed);
+ lbl_speed->set_text(format("%3.0f", speed));
+ }
+ else if(msg.type=="reverse-changed")
+ tgl_forward->set_value(!msg.value.value<bool>());
}
-void TrainPanel::loco_function_changed(unsigned func, bool value)
+void TrainPanel::train_function_changed(unsigned func, bool value)
{
map<unsigned, GLtk::Toggle *>::iterator i = tgl_funcs.find(func);
if(i!=tgl_funcs.end())
i->second->set_value(value);
}
+void TrainPanel::train_route_changed(const Route *r)
+{
+ if(r)
+ lbl_route->set_text(r->get_name());
+ else
+ lbl_route->set_text("Free run");
+}
+
void TrainPanel::train_status_changed(const string &s)
{
lbl_status->set_text(s);
void TrainPanel::place_clicked()
{
- engineer.place_train(train);
+ engineer.pick(true);
+ 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);
+ TrainProperties *dialog = new TrainProperties(engineer, &train);
+ engineer.get_root().add(*dialog);
+ dialog->set_position(geom.x+geom.w, geom.y+geom.h-dialog->get_geometry().h);
+}
+
+void TrainPanel::route_clicked()
+{
+ RouteSelect *dialog = new RouteSelect(engineer, 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()
+{
+ engineer.pick(false);
+ pick_conn = engineer.signal_pick_done.connect(sigc::mem_fun(this, &TrainPanel::go_to));
+}
+
+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.ai_message(TrainAI::Message("set-target-speed", speed));
}
void TrainPanel::forward_toggled(bool value)
{
- train.set_reverse(!value);
+ train.ai_message(TrainAI::Message("set-reverse", !value));
}
void TrainPanel::func_toggled(bool value, unsigned func)
{
- train.get_locomotive().set_function(func, value);
+ train.set_function(func, value);
+}
+
+void TrainPanel::place(Track *track, unsigned ep)
+{
+ pick_conn.disconnect();
+
+ BlockIter block = TrackIter(track, ep).block_iter();
+ if(block)
+ train.place(block);
+}
+
+void TrainPanel::go_to(Track *track, unsigned)
+{
+ pick_conn.disconnect();
+
+ TrainRouter *router = train.get_ai_of_type<TrainRouter>();
+ if(router)
+ router->set_destination(track->get_block());
}
projects / r2c2.git / blobdiff