Forgot to add the new files

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

diff --git a/source/libmarklin/trafficmanager.cpp b/source/libmarklin/trafficmanager.cpp
index 6de46a2673b904b691d0e14f358a7aac2c46f4c3..49dda42954d05ccdcb8b58f067899743111c4dbf 100644 (file)
--- a/source/libmarklin/trafficmanager.cpp
+++ b/source/libmarklin/trafficmanager.cpp
@@ -6,9 +6,12 @@ Distributed under the GPL
 */
 
 #include <algorithm>
+#include <msp/datafile/writer.h>
 #include <msp/time/utils.h>
+#include "catalogue.h"
 #include "control.h"
 #include "layout.h"
+#include "locotype.h"
 #include "tracktype.h"
 #include "trafficmanager.h"
 #include "turnout.h"
@@ -22,19 +25,20 @@ TrafficManager::TrafficManager(Control &c, Layout &l):
        control(c),
        layout(l)
 {
-       const set<Track *> &tracks=layout.get_tracks();
+       const set<Track *> &tracks = layout.get_tracks();
 
        set<Track *> used_tracks;
        for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
        {
                if(unsigned tid=(*i)->get_turnout_id())
-                       new Turnout(control, tid, (*i)->get_type().get_n_routes()>=3);
+                       new Turnout(control, tid, (*i)->get_type().get_n_paths()>=3);
                if(unsigned sid=(*i)->get_sensor_id())
-                       new Sensor(control, sid);
+                       if(!control.get_sensors().count(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());
                }
@@ -54,11 +58,20 @@ TrafficManager::~TrafficManager()
                delete *i;
 }
 
+Block &TrafficManager::get_block(unsigned id) const
+{
+       for(list<Block *>::const_iterator i=blocks.begin(); i!=blocks.end(); ++i)
+               if((*i)->get_id()==id)
+                       return **i;
+
+       throw KeyError("Unknown block", lexical_cast(id));
+}
+
 Block &TrafficManager::get_block_by_track(const Track &t) const
 {
        for(list<Block *>::const_iterator i=blocks.begin(); i!=blocks.end(); ++i)
        {
-               const set<Track *> &tracks=(*i)->get_tracks();
+               const set<Track *> &tracks = (*i)->get_tracks();
                if(tracks.count(const_cast<Track *>(&t)))
                        return **i;
        }
@@ -66,26 +79,67 @@ Block &TrafficManager::get_block_by_track(const Track &t) const
        throw InvalidParameterValue("Unknown track");
 }
 
+Train &TrafficManager::get_train_by_locomotive(const Locomotive &loco) const
+{
+       for(list<Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
+               if(&(*i)->get_locomotive()==&loco)
+                       return **i;
+
+       throw InvalidParameterValue("Unknown locomotive");
+}
+
 void TrafficManager::add_train(Train *t)
 {
        if(find(trains.begin(), trains.end(), t)==trains.end())
+       {
                trains.push_back(t);
+               signal_train_added.emit(*t);
+       }
 }
 
 void TrafficManager::tick()
 {
-       Time::TimeStamp t=Time::now();
+       Time::TimeStamp t = Time::now();
        Time::TimeDelta dt;
        if(last_tick)
-               dt=t-last_tick;
-       last_tick=t;
+               dt = t-last_tick;
+       last_tick = t;
 
        for(list<Train *>::iterator i=trains.begin(); i!=trains.end(); ++i)
                (*i)->tick(t, dt);
 }
 
-void TrafficManager::turnout_route_changed(unsigned, Turnout *)
+void TrafficManager::save(const string &fn) const
+{
+       IO::BufferedFile out(fn, IO::M_WRITE);
+       DataFile::Writer writer(out);
+       for(list<Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
+       {
+               const Locomotive &loco = (*i)->get_locomotive();
+               DataFile::Statement st("train");
+               st.append(loco.get_type().get_article_number());
+               st.append(loco.get_address());
+               (*i)->save(st.sub);
+               writer.write(st);
+       }
+}
+
+void TrafficManager::turnout_path_changed(unsigned, Turnout *)
+{
+}
+
+
+TrafficManager::Loader::Loader(TrafficManager &tm):
+       DataFile::BasicLoader<TrafficManager>(tm)
+{
+       add("train", &Loader::train);
+}
+
+void TrafficManager::Loader::train(unsigned art_nr, unsigned addr)
 {
+       Locomotive *loco = new Locomotive(obj.layout.get_catalogue().get_locomotive(art_nr), obj.control, addr);
+       Train *trn = new Train(obj, *loco);
+       load_sub(*trn);
 }
 
 } // namespace Marklin