Add state loading and saving to engineer

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

diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp
index 5466302ca7cfbbc60955deb1b36c57ce39e85e5e..581a301d8f194df79574671c15e95d165e4714c0 100644 (file)
--- a/source/engineer/engineer.cpp
+++ b/source/engineer/engineer.cpp
@@ -10,6 +10,7 @@ Distributed under the GPL
 #include <GL/gl.h>
 #include <msp/core/except.h>
 #include <msp/core/getopt.h>
+#include <msp/fs/stat.h>
 #include <msp/gbase/display.h>
 #include <msp/gbase/window.h>
 #include <msp/gl/immediate.h>
@@ -29,8 +30,6 @@ using namespace std;
 using namespace Marklin;
 using namespace Msp;
 
-#include <iostream>
-
 Engineer::Engineer(int argc, char **argv):
        screen_w(1280),
        screen_h(960),
@@ -84,10 +83,12 @@ Engineer::Engineer(int argc, char **argv):
        const vector<string> &args=getopt.get_args();
        if(args.empty())
                throw UsageError("No layout given");
-       layout.load(args.front());
+       DataFile::load(layout, args.front());
 
        trfc_mgr=new TrafficManager(control, layout);
        trfc_mgr->signal_block_reserved.connect(sigc::mem_fun(this, &Engineer::block_reserved));
+       if(FS::exists("engineer.state"))
+               DataFile::load(*trfc_mgr, "engineer.state");
 
        const map<unsigned, Sensor *> &sensors=control.get_sensors();
        for(map<unsigned, Sensor *>::const_iterator i=sensors.begin(); i!=sensors.end(); ++i)
@@ -98,6 +99,7 @@ Engineer::Engineer(int argc, char **argv):
 
 Engineer::~Engineer()
 {
+       trfc_mgr->save("engineer.state");
        delete trfc_mgr;
 }
 
@@ -179,6 +181,18 @@ int Engineer::main()
        main_panel->set_position(0, screen_h-main_panel->get_geometry().h);
        main_panel->set_visible(true);
 
+       const list<Train *> &trains=trfc_mgr->get_trains();
+       int y=main_panel->get_geometry().y;
+       for(list<Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
+       {
+               TrainPanel *tpanel=new TrainPanel(*this, ui_res, **i);
+               root->add(*tpanel);
+               tpanel->set_position(0, y-tpanel->get_geometry().h);
+               train_panels.push_back(tpanel);
+               tpanel->set_visible(true);
+               y-=tpanel->get_geometry().h;
+       }
+
        wnd->show();
 
        Application::main();