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 8e44fb52d26dc362a9258f50017d2e9fef1271de..de5588cefb98449790a8f4ca3923c868399acbaf 100644 (file)
--- a/source/libr2c2/layout.h
+++ b/source/libr2c2/layout.h
@@ -5,14 +5,16 @@
 #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;
@@ -58,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:
@@ -70,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;
@@ -129,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