Add support for named zones

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

diff --git a/source/libr2c2/layout.h b/source/libr2c2/layout.h
index 86db65895c3fead5aa8b83206a2d26e84043b3ee..ecb801f0e07c5bc8d4c4af4f9edb300967fba6db 100644 (file)
--- a/source/libr2c2/layout.h
+++ b/source/libr2c2/layout.h
@@ -23,6 +23,7 @@ class Route;
 class Track;
 class Train;
 class Vehicle;
+class Zone;
 
 class Layout
 {
@@ -42,13 +43,18 @@ public:
                void track(ArticleNumber);
                void train(unsigned, unsigned, const std::string &);
                void train(ArticleNumber, unsigned, const std::string &);
+               void zone();
        };
 
-public:
+       typedef std::set<Zone *> ZoneSet;
+       typedef std::vector<Zone *> ZoneArray;
+
        sigc::signal<void, Track &> signal_track_added;
        sigc::signal<void, Track &> signal_track_removed;
        sigc::signal<void, Route &> signal_route_added;
        sigc::signal<void, Route &> signal_route_removed;
+       sigc::signal<void, Zone &> signal_zone_added;
+       sigc::signal<void, Zone &> signal_zone_removed;
        sigc::signal<void, Train &> signal_train_added;
        sigc::signal<void, Train &> signal_train_removed;
        sigc::signal<void, Vehicle &> signal_vehicle_added;
@@ -62,6 +68,7 @@ private:
        std::string base;
        std::set<Track *> tracks;
        std::set<Route *> routes;
+       ZoneSet zones;
        std::set<Block *> blocks;
        std::map<unsigned, Train *> trains;
        std::set<Vehicle *> vehicles;
@@ -95,6 +102,12 @@ public:
        void update_routes();
        void remove_route(Route &);
 
+       void add_zone(Zone &);
+       const ZoneSet &get_zones() const { return zones; }
+       ZoneArray get_zones(const std::string &) const;
+       Zone &get_zone(const std::string &, unsigned) const;
+       void remove_zone(Zone &);
+
        void add_train(Train &);
        Train &get_train(unsigned) const;
        const std::map<unsigned, Train *> &get_trains() const { return trains; }
@@ -106,8 +119,8 @@ public:
        void tick();
        void emergency(const std::string &);
 
-       void save(const std::string &);
-       void save_trains(const std::string &);
+       void save(const std::string &) const;
+       void save_trains(const std::string &) const;
 private:
        void sensor_event(unsigned, bool);
 };