Also use halt in sighandler

[r2c2.git] / source / engineer / engineer.cpp

diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp
index 9b49c847ca5a21ff11229f0bb42e5252f622b9fb..789c6055cd699ce621a8c7f137a113bbacc4eb4b 100644 (file)
--- a/source/engineer/engineer.cpp
+++ b/source/engineer/engineer.cpp
@@ -12,6 +12,7 @@
 #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>
@@ -26,6 +27,7 @@
 #include "3d/vehicle.h"
 #include "engineer.h"
 #include "mainwindow.h"
+#include "newtraindialog.h"
 #include "traindialog.h"
 #include "trainview.h"
 
@@ -39,6 +41,7 @@ Engineer::Engineer(int argc, char **argv):
        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),
@@ -49,6 +52,10 @@ Engineer::Engineer(int argc, char **argv):
        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);
@@ -64,8 +71,11 @@ Engineer::Engineer(int argc, char **argv):
        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>();
@@ -76,7 +86,7 @@ Engineer::Engineer(int argc, char **argv):
        const set<Track *> &tracks = layout.get_all<Track>();
        for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
                if((*i)->get_type().is_turnout())
-                       new Path3D(layout_3d.get<Track3D>(**i));
+                       new Path3D(layout_3d.get_3d(**i));
 
        if(FS::exists(options.state_fn))
                DataFile::load(layout, options.state_fn);
@@ -111,18 +121,17 @@ Engineer::Engineer(int argc, char **argv):
 
 Engineer::~Engineer()
 {
-       const map<unsigned, Train *> &trains = layout.get_trains();
-       for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
-               layout.get_driver().set_loco_speed(i->first, 0);
-       layout.get_driver().flush();
-
        if(!options.simulate)
        {
                layout.save_dynamic(options.state_fn+".tmp");
                FS::rename(options.state_fn+".tmp", options.state_fn);
        }
 
+       layout.get_driver().halt(true);
+       layout.get_driver().flush();
+
        delete overlay;
+       delete root_arrangement;
        delete root;
 
        delete server;
@@ -187,7 +196,7 @@ void Engineer::button_press(unsigned btn)
                Object *obj = pick_object(pointer);
                if(Track *track = dynamic_cast<Track *>(obj))
                {
-                       if(track->get_turnout_id())
+                       if(track->get_type().is_turnout())
                        {
                                Block &block = track->get_block();
                                if(block.get_train() && block.get_train()->is_block_critical(block))
@@ -204,14 +213,14 @@ void Engineer::button_press(unsigned btn)
                                                        ++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))
@@ -290,9 +299,26 @@ Object *Engineer::pick_object(const Vector &p)
        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<Vehicle3D>(train.get_vehicle(0));
+       Vehicle3D &loco3d = layout_3d.get_3d(train.get_vehicle(0));
        overlay->set_label(loco3d, train.get_name());
        train.signal_name_changed.connect(sigc::bind<0>(sigc::mem_fun(overlay, &Overlay3D::set_label), sigc::ref(loco3d)));
 }
@@ -339,9 +365,7 @@ void Engineer::sighandler(int sig)
        {
                signal(sig, SIG_DFL);
                IO::print(IO::cerr, "Fatal signal received, terminating\n");
-               const map<unsigned, Train *> &trains = layout.get_trains();
-               for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
-                       layout.get_driver().set_loco_speed(i->first, 0);
+               layout.get_driver().halt(true);
                layout.get_driver().flush();
                raise(sig);
        }