Pass sensor events through blocks

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

diff --git a/source/libr2c2/layout.h b/source/libr2c2/layout.h
index ecb801f0e07c5bc8d4c4af4f9edb300967fba6db..a4042316bbdc61d1af6b5f6357a7dbfaadd35cd8 100644 (file)
--- a/source/libr2c2/layout.h
+++ b/source/libr2c2/layout.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of R²C²
-Copyright © 2006-2010  Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2011  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
@@ -12,16 +12,17 @@ Distributed under the GPL
 #include <sigc++/sigc++.h>
 #include <msp/datafile/loader.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;
 
@@ -43,6 +44,7 @@ public:
                void track(ArticleNumber);
                void train(unsigned, unsigned, const std::string &);
                void train(ArticleNumber, unsigned, const std::string &);
+               void turnout(unsigned, unsigned);
                void zone();
        };
 
@@ -60,6 +62,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, const std::string &> signal_emergency;
 
 private:
@@ -86,8 +89,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;
@@ -120,9 +124,9 @@ public:
        void emergency(const std::string &);
 
        void save(const std::string &) const;
-       void save_trains(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