Handle sensors in a separate class

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

diff --git a/source/libr2c2/layout.h b/source/libr2c2/layout.h
index c32795594bd253b43d03299e0dfe2e30f3b74d81..de5588cefb98449790a8f4ca3923c868399acbaf 100644 (file)
--- a/source/libr2c2/layout.h
+++ b/source/libr2c2/layout.h
@@ -5,18 +5,20 @@
 #include <sigc++/sigc++.h>
 #include <msp/datafile/objectloader.h>
 #include <msp/time/timestamp.h>
-#include "block.h"
+#include "geometry.h"
+#include "sensor.h"
 
 namespace R2C2 {
 
 class ArticleNumber;
+class Block;
 class Catalogue;
 class Driver;
+class Object;
 class Route;
 class Signal;
 class Track;
 class Train;
-class Vector;
 class Vehicle;
 class Zone;
 
@@ -31,7 +33,6 @@ public:
        public:
                Loader(Layout &);
        private:
-               virtual void finish();
                void route();
                void route(const std::string &);
                void signal(ArticleNumber);
@@ -59,7 +60,7 @@ public:
        sigc::signal<void, Vehicle &> signal_vehicle_added;
        sigc::signal<void, Vehicle &> signal_vehicle_removed;
        sigc::signal<void, Block &, Train *> signal_block_reserved;
-       sigc::signal<void, Block &, Block::State> signal_block_state_changed;
+       sigc::signal<void, Sensor &, Sensor::State> signal_sensor_state_changed;
        sigc::signal<void, const std::string &> signal_emergency;
 
 private:
@@ -71,6 +72,7 @@ private:
        std::set<Route *> routes;
        ZoneSet zones;
        std::set<Block *> blocks;
+       std::set<Sensor *> sensors;
        std::map<unsigned, Train *> trains;
        std::set<Vehicle *> vehicles;
        Msp::Time::TimeStamp last_tick;
@@ -87,20 +89,20 @@ public:
 
        void add_track(Track &);
        const std::set<Track *> &get_tracks() const { return tracks; }
-       Track *pick_track(const Vector &, const Vector &);
+       Track *pick_track(const Ray &);
        void remove_track(Track &);
        unsigned allocate_turnout_id();
 
        void add_signal(Signal &);
        const std::set<Signal *> &get_signals() const { return signals; }
-       Signal *pick_signal(const Vector &, const Vector &);
+       Signal *pick_signal(const Ray &);
        void remove_signal(Signal &);
 
-       Object *pick_object(const Vector &, const Vector &);
+       Object *pick_object(const Ray &);
 
 private:
        template<typename T>
-       static T *pick(const std::set<T *> &, const Vector &, const Vector &);
+       static T *pick(const std::set<T *> &, const Ray &);
 
 public:
        void add_block(Block &);
@@ -130,13 +132,16 @@ public:
        void add_vehicle(Vehicle &);
        void remove_vehicle(Vehicle &);
 
+       void add_sensor(Sensor &);
+       void remove_sensor(Sensor &);
+
        void tick();
        void emergency(const std::string &);
 
        void save(const std::string &) const;
        void save_dynamic(const std::string &) const;
 private:
-       void block_state_changed(Block &, Block::State);
+       void sensor_state_changed(Sensor &, Sensor::State);
 };
 
 } // namespace R2C2