Handle sensors in a separate class

[r2c2.git] / source / libr2c2 / layout.cpp

diff --git a/source/libr2c2/layout.cpp b/source/libr2c2/layout.cpp
index 821482ae1da813c76cfeb32e64b2747dcac548fa..16542953a76320697ece0cb037767c70d9793ef3 100644 (file)
--- a/source/libr2c2/layout.cpp
+++ b/source/libr2c2/layout.cpp
@@ -10,7 +10,10 @@
 #include "driver.h"
 #include "layout.h"
 #include "route.h"
+#include "signal.h"
+#include "signaltype.h"
 #include "track.h"
+#include "trackcircuit.h"
 #include "tracktype.h"
 #include "train.h"
 #include "vehicletype.h"
@@ -48,6 +51,8 @@ Layout::~Layout()
                delete *routes.begin();
        while(!zones.empty())
                delete *zones.begin();
+       while(!signals.empty())
+               delete *signals.begin();
        while(!tracks.empty())
                delete *tracks.begin();
        while(!blocks.empty())
@@ -57,7 +62,7 @@ Layout::~Layout()
 Driver &Layout::get_driver() const
 {
        if(!driver)
-               throw InvalidState("No driver");
+               throw logic_error("!driver");
        return *driver;
 }
 
@@ -70,6 +75,11 @@ void Layout::add_track(Track &t)
        }
 }
 
+Track *Layout::pick_track(const Ray &ray)
+{
+       return pick(tracks, ray);
+}
+
 void Layout::remove_track(Track &t)
 {
        if(tracks.erase(&t))
@@ -79,15 +89,6 @@ void Layout::remove_track(Track &t)
        }
 }
 
-Track *Layout::pick_track(const Vector &start, const Vector &ray)
-{
-       for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-               if((*i)->collide_ray(start, ray))
-                       return *i;
-
-       return 0;
-}
-
 unsigned Layout::allocate_turnout_id()
 {
        set<unsigned> used_ids;
@@ -103,15 +104,46 @@ unsigned Layout::allocate_turnout_id()
        return result;
 }
 
+void Layout::add_signal(Signal &s)
+{
+       if(signals.insert(&s).second)
+               signal_signal_added.emit(s);
+}
+
+Signal *Layout::pick_signal(const Ray &ray)
+{
+       return pick(signals, ray);
+}
+
+void Layout::remove_signal(Signal &s)
+{
+       if(signals.erase(&s))
+               signal_signal_removed.emit(s);
+}
+
+Object *Layout::pick_object(const Ray &ray)
+{
+       if(Object *obj = pick_track(ray))
+               return obj;
+       else if((obj = pick_signal(ray)))
+               return obj;
+       return 0;
+}
+
+template<typename T>
+T *Layout::pick(const set<T *> &objs, const Ray &ray)
+{
+       for(typename set<T *>::const_iterator i=objs.begin(); i!=objs.end(); ++i)
+               if((*i)->collide_ray(ray))
+                       return *i;
+
+       return 0;
+}
+
 void Layout::add_block(Block &b)
 {
        blocks.insert(&b);
        b.signal_reserved.connect(sigc::bind<0>(signal_block_reserved, sigc::ref(b)));
-       if(b.get_sensor_id())
-       {
-               b.signal_state_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Layout::block_state_changed), sigc::ref(b)));
-               b.signal_state_changed.connect(sigc::bind<0>(signal_block_state_changed, sigc::ref(b)));
-       }
 }
 
 Block &Layout::get_block(unsigned id) const
@@ -257,6 +289,20 @@ void Layout::remove_vehicle(Vehicle &v)
                signal_vehicle_removed.emit(v);
 }
 
+void Layout::add_sensor(Sensor &s)
+{
+       if(sensors.insert(&s).second)
+       {
+               s.signal_state_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Layout::sensor_state_changed), sigc::ref(s)));
+               s.signal_state_changed.connect(sigc::bind<0>(signal_sensor_state_changed, sigc::ref(s)));
+       }
+}
+
+void Layout::remove_sensor(Sensor &s)
+{
+       sensors.erase(&s);
+}
+
 void Layout::tick()
 {
        if(driver)
@@ -268,7 +314,9 @@ void Layout::tick()
                dt = t-last_tick;
        last_tick = t;
 
-       for(set<Block *>::iterator i=blocks.begin(); i!=blocks.end(); ++i)
+       for(set<Sensor *>::iterator i=sensors.begin(); i!=sensors.end(); ++i)
+               (*i)->tick(dt);
+       for(set<Signal *>::iterator i=signals.begin(); i!=signals.end(); ++i)
                (*i)->tick(dt);
        for(map<unsigned, Train *>::iterator i=trains.begin(); i!=trains.end(); ++i)
                i->second->tick(t, dt);
@@ -298,6 +346,14 @@ void Layout::save(const string &fn) const
                writer.write(st);
        }
 
+       for(set<Signal *>::const_iterator i=signals.begin(); i!=signals.end(); ++i)
+       {
+               DataFile::Statement st("signal");
+               st.append((*i)->get_type().get_article_number());
+               (*i)->save(st.sub);
+               writer.write(st);
+       }
+
        for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i)
        {
                if((*i)->is_temporary())
@@ -336,19 +392,27 @@ void Layout::save_dynamic(const string &fn) const
        }
 }
 
-void Layout::block_state_changed(Block &block, Block::State state)
+void Layout::sensor_state_changed(Sensor &sensor, Sensor::State state)
 {
-       if(state==Block::ACTIVE && !block.get_train())
-               emergency(format("Unreserved sensor %d triggered", block.get_sensor_id()));
+       if(state==Sensor::ACTIVE)
+       {
+               Block *block = 0;
+               if(TrackCircuit *tc = dynamic_cast<TrackCircuit *>(&sensor))
+                       block = &tc->get_block();
+
+               if(block && !block->get_train())
+                       emergency(format("Unreserved sensor %d triggered", sensor.get_address()));
+       }
 }
 
 
 Layout::Loader::Loader(Layout &l):
-       DataFile::BasicLoader<Layout>(l),
+       DataFile::ObjectLoader<Layout>(l),
        new_tracks(false)
 {
        add("base",  &Layout::base);
        add("route", static_cast<void (Loader::*)()>(&Loader::route));
+       add("signal", &Loader::signal);
        add("track", static_cast<void (Loader::*)(ArticleNumber)>(&Loader::track));
        add("train", static_cast<void (Loader::*)(ArticleNumber, unsigned, const std::string &)>(&Loader::train));
        add("turnout", &Loader::turnout);
@@ -360,12 +424,6 @@ Layout::Loader::Loader(Layout &l):
        add("train", static_cast<void (Loader::*)(unsigned, unsigned, const std::string &)>(&Loader::train));
 }
 
-void Layout::Loader::finish()
-{
-       for(set<Track *>::iterator i=obj.tracks.begin(); i!=obj.tracks.end(); ++i)
-               (*i)->check_slope();
-}
-
 void Layout::Loader::route()
 {
        Route *rte = new Route(obj);
@@ -379,6 +437,12 @@ void Layout::Loader::route(const string &n)
        load_sub(*rte);
 }
 
+void Layout::Loader::signal(ArticleNumber art_nr)
+{
+       Signal *sig = new Signal(obj, obj.catalogue.get_signal(art_nr));
+       load_sub(*sig);
+}
+
 void Layout::Loader::track(unsigned art_nr)
 {
        track(ArticleNumber(art_nr));
@@ -391,7 +455,7 @@ void Layout::Loader::track(ArticleNumber art_nr)
        new_tracks = true;
        for(set<Track *>::iterator i=obj.tracks.begin(); i!=obj.tracks.end(); ++i)
                if(*i!=trk)
-                       trk->snap_to(**i, true);
+                       trk->link_to(**i);
 }
 
 void Layout::Loader::train(unsigned art_nr, unsigned addr, const std::string &proto)