-/* $Id$
-
-This file is part of R²C²
-Copyright © 2006-2011 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
#include <cmath>
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
#include "libr2c2/aicontrol.h"
-#include "libr2c2/timetable.h"
#include "libr2c2/trackiter.h"
+#include "libr2c2/trainrouter.h"
#include "libr2c2/vehicletype.h"
#include "engineer.h"
#include "routeselect.h"
-#include "timetabledialog.h"
#include "trainpanel.h"
#include "trainproperties.h"
#include "trainview.h"
TrainPanel::TrainPanel(Engineer &e, Train &t):
engineer(e),
train(t),
+ status(train),
expanded(false)
{
set_size(200, 65);
pnl_extra->set_geometry(GLtk::Geometry(0, 10, geom.w, 135));
pnl_extra->set_visible(false);
- const Route *route = train.get_route();
+ 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));
- train.signal_route_changed.connect(sigc::mem_fun(this, &TrainPanel::train_route_changed));
+ router->signal_route_changed.connect(sigc::mem_fun(this, &TrainPanel::train_route_changed));
- pnl_extra->add(*(lbl_status = new GLtk::Label(train.get_status())));
+ pnl_extra->add(*(lbl_status = new GLtk::Label(status.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));
+ status.signal_changed.connect(sigc::mem_fun(this, &TrainPanel::train_status_changed));
- const map<unsigned, string> &funcs = train.get_locomotive_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+=36)
+ for(VehicleType::FunctionMap::const_iterator i=funcs.begin(); i!=funcs.end(); ++i, x+=36)
{
string fname = i->second;
fname[0] = toupper(fname[0]);
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("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("View")));
btn->set_geometry(GLtk::Geometry(geom.w-46, 30, 36, 25));
btn->signal_clicked.connect(sigc::mem_fun(this, &TrainPanel::view_clicked));
lbl_speed->set_text(format("%3.0f", speed));
}
else if(msg.type=="reverse-changed")
- tgl_forward->set_value(msg.value.value<bool>());
+ tgl_forward->set_value(!msg.value.value<bool>());
}
void TrainPanel::train_function_changed(unsigned func, bool value)
pick_conn = engineer.signal_pick_done.connect(sigc::mem_fun(this, &TrainPanel::go_to));
}
-void TrainPanel::timetable_clicked()
-{
- Timetable *timetable = dynamic_cast<Timetable *>(train.get_tagged_ai("timetable"));
- if(!timetable)
- {
- timetable = new Timetable(train);
- timetable->set_tag("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);
-}
-
void TrainPanel::view_clicked()
{
TrainView *dialog = new TrainView(engineer, train);
{
pick_conn.disconnect();
- Block &block = track->get_block();
- TrackIter iter(track, ep);
-
- 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==iter.track() && eps[i].track_ep==iter.entry())
- {
- train.place(block, i);
- ok = true;
- }
-
- if(ok)
- break;
-
- iter = iter.flip().reverse();
- }
+ BlockIter block = TrackIter(track, ep).block_iter();
+ if(block)
+ train.place(block);
}
void TrainPanel::go_to(Track *track, unsigned)
{
pick_conn.disconnect();
- if(!train.go_to(*track))
- engineer.set_status("Could not set route");
+ TrainRouter *router = train.get_ai_of_type<TrainRouter>();
+ if(router)
+ router->set_destination(track->get_block());
}