BasicLoader is now called ObjectLoader

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

diff --git a/source/libr2c2/layout.h b/source/libr2c2/layout.h
index 86db65895c3fead5aa8b83206a2d26e84043b3ee..b89cacb90b1d11a5c1279d0ff2c11b5f9f9ef464 100644 (file)
--- a/source/libr2c2/layout.h
+++ b/source/libr2c2/layout.h
@@ -1,33 +1,28 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2006-2010  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #ifndef LIBR2C2_LAYOUT_H_
 #define LIBR2C2_LAYOUT_H_
 
 #include <set>
 #include <sigc++/sigc++.h>
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
 #include <msp/time/timestamp.h>
+#include "block.h"
 
 namespace R2C2 {
 
 class ArticleNumber;
-class Block;
 class Catalogue;
 class Driver;
 class Route;
 class Track;
 class Train;
+class Vector;
 class Vehicle;
+class Zone;
 
 class Layout
 {
 public:
-       class Loader: public Msp::DataFile::BasicLoader<Layout>
+       class Loader: public Msp::DataFile::ObjectLoader<Layout>
        {
        private:
                bool new_tracks;
@@ -42,18 +37,25 @@ public:
                void track(ArticleNumber);
                void train(unsigned, unsigned, const std::string &);
                void train(ArticleNumber, unsigned, const std::string &);
+               void turnout(unsigned, unsigned);
+               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;
        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, const std::string &> signal_emergency;
 
 private:
@@ -62,6 +64,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;
@@ -79,8 +82,9 @@ public:
 
        void add_track(Track &);
        const std::set<Track *> &get_tracks() const { return tracks; }
+       Track *pick_track(const Vector &, const Vector &);
        void remove_track(Track &);
-       unsigned allocate_turnout_id(bool);
+       unsigned allocate_turnout_id();
 
        void add_block(Block &);
        Block &get_block(unsigned) const;
@@ -95,6 +99,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,10 +116,10 @@ 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_dynamic(const std::string &) const;
 private:
-       void sensor_event(unsigned, bool);
+       void block_state_changed(Block &, Block::State);
 };
 
 } // namespace R2C2