/* $Id$
-This file is part of the MSP Märklin suite
+This file is part of R²C²
Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa
Distributed under the GPL
*/
#include <cmath>
#include <msp/strings/formatter.h>
-#include "libmarklin/timetable.h"
-#include "libmarklin/vehicletype.h"
+#include "libr2c2/timetable.h"
+#include "libr2c2/trackiter.h"
+#include "libr2c2/vehicletype.h"
#include "engineer.h"
#include "routeselect.h"
#include "timetabledialog.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),
expanded(false)
train.signal_control_changed.connect(sigc::mem_fun(this, &TrainPanel::train_control_changed));
- add(*(pnl_basic = new GLtk::Panel(res)));
+ add(*(pnl_basic = new GLtk::Panel));
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()))));
+ 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, 28, 35, 20));
- pnl_basic->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(50, 28, geom.w-77, 20));
train.signal_name_changed.connect(sigc::mem_fun(lbl_name, &GLtk::Label::set_text));
- pnl_basic->add(*(lbl_speed = new GLtk::Label(res, " 0")));
+ pnl_basic->add(*(lbl_speed = new GLtk::Label(" 0")));
lbl_speed->set_style("digital");
lbl_speed->set_geometry(GLtk::Geometry(10, 3, 35, 20));
- pnl_basic->add(*(sld_speed = new GLtk::HSlider(res)));
+ 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));
- pnl_basic->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, 0, 20, 27));
tgl_forward->set_value(true);
tgl_forward->signal_toggled.connect(sigc::mem_fun(this, &TrainPanel::forward_toggled));
- pnl_basic->add(*(btn_expand = new GLtk::Button(res)));
+ 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(res)));
+ 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);
const Route *route = train.get_route();
- pnl_extra->add(*(lbl_route = new GLtk::Label(res, (route ? route->get_name() : "Free run"))));
+ 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));
train.signal_route_changed.connect(sigc::mem_fun(this, &TrainPanel::train_route_changed));
- pnl_extra->add(*(lbl_status = new GLtk::Label(res, train.get_status())));
+ pnl_extra->add(*(lbl_status = new GLtk::Label(train.get_status())));
lbl_status->set_style("digital");
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));
string fname = i->second;
fname[0] = toupper(fname[0]);
GLtk::Toggle *tgl;
- pnl_extra->add(*(tgl = new GLtk::Toggle(res)));
+ pnl_extra->add(*(tgl = new GLtk::Toggle));
tgl->set_text(fname);
tgl->set_geometry(GLtk::Geometry(x, 108, 36, 27));
tgl->set_value(train.get_function(i->first));
GLtk::Button *btn;
- pnl_extra->add(*(btn = new GLtk::Button(res, "Edit")));
+ 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));
- pnl_extra->add(*(btn = new GLtk::Button(res, "Place")));
+ 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));
- pnl_extra->add(*(btn = new GLtk::Button(res, "Take")));
+ 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(res, "GoTo")));
+ 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(res, "Route")));
+ 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(res, "TTbl")));
+ pnl_extra->add(*(btn = new GLtk::Button("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")));
+ 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::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, res, train);
+ 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);
}
train.set_timetable(timetable);
}
- TimetableDialog *dialog = new TimetableDialog(res, *timetable);
+ TimetableDialog *dialog = new TimetableDialog(*timetable);
engineer.get_root().add(*dialog);
dialog->set_position(geom.x+geom.w, geom.y+geom.h-dialog->get_geometry().h);
}
pick_conn.disconnect();
Block &block = track->get_block();
+ TrackIter iter(track, ep);
- while(1)
+ while(block.has_track(*iter))
{
const vector<Block::Endpoint> &eps = block.get_endpoints();
bool ok = false;
for(unsigned i=0; (!ok && i<eps.size()); ++i)
- if(eps[i].track==track && eps[i].track_ep==ep)
+ if(eps[i].track==iter.track() && eps[i].track_ep==iter.entry())
{
train.place(block, i);
ok = true;
if(ok)
break;
- else
- {
- Track *next = track->get_links()[ep];
- ep = next->traverse(next->get_endpoint_by_link(*track), 0);
- track = next;
- if(!block.has_track(*track))
- break;
- }
+
+ iter = iter.flip().reverse();
}
}
{
pick_conn.disconnect();
- try
- {
- train.go_to(*track);
- }
- catch(const Exception &e)
- {
- engineer.set_status(e.what());
- }
+ if(!train.go_to(*track))
+ engineer.set_status("Could not set route");
}