#include <msp/gl/matrix.h>
#include <msp/gl/misc.h>
#include <msp/gl/tests.h>
+#include <msp/gltk/floatingarrangement.h>
#include <msp/io/print.h>
#include <msp/strings/format.h>
#include <msp/time/units.h>
#include "3d/vehicle.h"
#include "engineer.h"
#include "mainwindow.h"
+#include "newtraindialog.h"
#include "traindialog.h"
#include "trainview.h"
keyboard(window),
mouse(window),
ui_res("r2c2.res"),
+ import_active(false),
layout(catalogue, (options.driver.empty() ? 0 : Driver::create(options.driver))),
layout_3d(layout),
server(0),
window.signal_close.connect(sigc::bind(sigc::mem_fun(this, &Engineer::exit), 0));
root = new GLtk::Root(ui_res, &window, &keyboard, &mouse);
+ GLtk::Layout *root_layout = new GLtk::Layout;
+ root->set_layout(root_layout);
+ root_layout->set_margin(GLtk::Sides());
+ root_arrangement = new GLtk::FloatingArrangement(*root_layout);
mouse.signal_button_press.connect(sigc::bind_return(sigc::mem_fun(this, &Engineer::button_press), false));
mouse.signal_axis_motion.connect(sigc::bind_return(sigc::mem_fun(this, &Engineer::axis_motion), false));
root->set_visible(true);
DataFile::load(catalogue, "tracks.dat");
DataFile::load(catalogue, "locos.dat");
DataFile::load(catalogue, "wagons.dat");
+ DataFile::load(catalogue, "terrain.dat");
DataFile::load(layout, options.layout_fn);
+ if(layout.has_driver())
+ layout.get_driver().signal_locomotive_detected.connect(sigc::mem_fun(this, &Engineer::locomotive_detected));
layout.signal_train_added.connect(sigc::mem_fun(this, &Engineer::train_added));
layout.signal_emergency.connect(sigc::mem_fun(this, &Engineer::set_status));
const set<Block *> &blocks = layout.get_all<Block>();
}
delete overlay;
+ delete root_arrangement;
delete root;
delete server;
Object *obj = pick_object(pointer);
if(Track *track = dynamic_cast<Track *>(obj))
{
- if(track->get_turnout_id())
+ if(track->get_turnout_address())
{
Block &block = track->get_block();
if(block.get_train() && block.get_train()->is_block_critical(block))
++i;
}
track->set_active_path(i);
- set_status(format("Turnout %d", track->get_turnout_id()));
+ set_status(format("Turnout %d", track->get_turnout_address()));
}
}
- if(unsigned sid = track->get_sensor_id())
+ if(unsigned saddr = track->get_sensor_address())
{
if(options.simulate)
- layout.get_driver().set_sensor(sid, !layout.get_driver().get_sensor(sid));
- set_status(format("Sensor %d", sid));
+ layout.get_driver().set_sensor(saddr, !layout.get_driver().get_sensor(saddr));
+ set_status(format("Sensor %d", saddr));
}
}
else if(Vehicle *veh = dynamic_cast<Vehicle *>(obj))
return layout.pick<Track>(Ray(start, Vector(ray)));
}
+void Engineer::locomotive_detected(const Driver::DetectedLocomotive &loco)
+{
+ if(!import_active)
+ {
+ NewTrainDialog *dlg = new NewTrainDialog(*this);
+ dlg->prefill(loco);
+ dlg->signal_response.connect(sigc::mem_fun(this, &Engineer::import_finished));
+ root->add(*dlg);
+ import_active = true;
+ }
+}
+
+void Engineer::import_finished(int)
+{
+ import_active = false;
+}
+
void Engineer::process_new_train(Train &train)
{
Vehicle3D &loco3d = layout_3d.get_3d(train.get_vehicle(0));