Convert engineer to use mspgbase instead of SDL

[r2c2.git] / source / libmarklin / trafficmanager.cpp

diff --git a/source/libmarklin/trafficmanager.cpp b/source/libmarklin/trafficmanager.cpp
index 31e854231c89ae8cad3b7fa69106690ebe0b1e87..096d675e8432aafbba37902cefa5200ecdcc7187 100644 (file)
--- a/source/libmarklin/trafficmanager.cpp
+++ b/source/libmarklin/trafficmanager.cpp
@@ -1,9 +1,11 @@
+#include <msp/time/utils.h>
 #include "control.h"
 #include "layout.h"
 #include "trafficmanager.h"
 #include "turnout.h"
 
 using namespace std;
+using namespace Msp;
 
 namespace Marklin {
 
@@ -11,27 +13,19 @@ TrafficManager::TrafficManager(Control &c, Layout &l):
        control(c),
        layout(l)
 {
-       const TrackSeq &tracks=layout.get_tracks();
+       const set<Track *> &tracks=layout.get_tracks();
 
-       TrackSet used_tracks;
-       for(TrackSeq::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
+       set<Track *> used_tracks;
+       for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
        {
                if(unsigned tid=(*i)->get_turnout_id())
-               {
-                       Turnout *t=control.get_turnout(tid);
-                       if(!t)
-                               t=new Turnout(control, tid);
-                       //t->signal_route_changed.connect(sigc::mem_fun(*i, &Track::set_current_route));
-               }
+                       new Turnout(control, tid);
                if(unsigned sid=(*i)->get_sensor_id())
-               {
-                       Sensor *s=control.get_sensor(sid);
-                       if(!s)
-                               s=new Sensor(control, sid);
-               }
+                       new Sensor(control, sid);
+
                if(used_tracks.count(*i)==0)
                {
-                       Block *block=new Block(*this, *i);
+                       Block *block=new Block(*this, **i);
                        blocks.push_back(block);
                        used_tracks.insert(block->get_tracks().begin(), block->get_tracks().end());
                }
@@ -46,16 +40,24 @@ TrafficManager::TrafficManager(Control &c, Layout &l):
        }
 }
 
-Block *TrafficManager::get_block_by_track(const Track *t) const
+TrafficManager::~TrafficManager()
+{
+       for(BlockSeq::iterator i=blocks.begin(); i!=blocks.end(); ++i)
+               delete *i;
+       for(TrainSeq::iterator i=trains.begin(); i!=trains.end(); ++i)
+               delete *i;
+}
+
+Block &TrafficManager::get_block_by_track(const Track &t) const
 {
        for(BlockSeq::const_iterator i=blocks.begin(); i!=blocks.end(); ++i)
        {
-               const TrackSet &tracks=(*i)->get_tracks();
-               if(tracks.count(const_cast<Track *>(t)))
-                       return *i;
+               const set<Track *> &tracks=(*i)->get_tracks();
+               if(tracks.count(const_cast<Track *>(&t)))
+                       return **i;
        }
 
-       return 0;
+       throw InvalidParameterValue("Unknown track");
 }
 
 void TrafficManager::add_train(Train *t)
@@ -64,6 +66,14 @@ void TrafficManager::add_train(Train *t)
                trains.push_back(t);
 }
 
+void TrafficManager::tick()
+{
+       Time::TimeStamp t=Time::now();
+
+       for(list<Train *>::iterator i=trains.begin(); i!=trains.end(); ++i)
+               (*i)->tick(t);
+}
+
 void TrafficManager::turnout_route_changed(unsigned, Turnout *)
 {
 }