Include block in the emergency signal

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

diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp
index 87e3dda10003c7fd917dec1a94b619f2911ffb93..cc604d3254bf747a150035b5b2c6dd52255d579e 100644 (file)
--- a/source/engineer/engineer.cpp
+++ b/source/engineer/engineer.cpp
@@ -27,6 +27,7 @@
 #include "3d/vehicle.h"
 #include "engineer.h"
 #include "mainwindow.h"
+#include "newtraindialog.h"
 #include "traindialog.h"
 #include "trainview.h"
 
@@ -40,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),
@@ -69,10 +71,13 @@ 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));
+       layout.signal_emergency.connect(sigc::mem_fun(this, &Engineer::emergency));
        const set<Block *> &blocks = layout.get_all<Block>();
        for(set<Block *>::const_iterator i=blocks.begin(); i!=blocks.end(); ++i)
                if(TrackCircuit *tc = (*i)->get_sensor())
@@ -116,17 +121,15 @@ 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;
@@ -193,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_address())
+                       if(track->get_type().is_turnout())
                        {
                                Block &block = track->get_block();
                                if(block.get_train() && block.get_train()->is_block_critical(block))
@@ -296,6 +299,28 @@ Object *Engineer::pick_object(const Vector &p)
        return layout.pick<Track>(Ray(start, Vector(ray)));
 }
 
+void Engineer::emergency(Block *, const string &msg)
+{
+       set_status(msg);
+}
+
+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));
@@ -345,9 +370,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);
        }