Make sure Block::signal_reserved is emitted consistently

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

diff --git a/source/libr2c2/block.h b/source/libr2c2/block.h
index f71ee29b63f6871ccc2a419e9638a02a22dc54e2..6823b2730343faa69c03b14b0f507701ad26b85d 100644 (file)
--- a/source/libr2c2/block.h
+++ b/source/libr2c2/block.h
@@ -4,6 +4,7 @@
 #include <list>
 #include <set>
 #include "track.h"
+#include "trackchain.h"
 
 namespace R2C2 {
 
@@ -13,7 +14,7 @@ class TrackCircuit;
 class TrackIter;
 class Train;
 
-class Block
+class Block: public TrackChain
 {
 public:
        struct Endpoint
@@ -21,7 +22,6 @@ public:
                Track *track;
                unsigned track_ep;
                Block *link;
-               unsigned paths;
 
                Endpoint(Track *, unsigned);
 
@@ -31,25 +31,31 @@ public:
        sigc::signal<void, Train *> signal_reserved;
 
 private:
-       Layout &layout;
        unsigned id;
-       unsigned sensor_id;
-       unsigned turnout_id;
+       unsigned sensor_addr;
+       unsigned turnout_addr;
+       bool conflict;
        TrackCircuit *sensor;
-       std::set<Track *> tracks;
        std::vector<Endpoint> endpoints;
        Train *train;
+       Train *pending_train;
+       bool emitting_reserve;
 
 public:
        Block(Layout &, Track &);
        ~Block();
 
+       virtual void set_name(const std::string &);
+
+private:
+       virtual void on_track_added(Track &);
+       virtual Validity check_validity(Track &) const;
+
+public:
        unsigned get_id() const { return id; }
-       unsigned get_sensor_id() const { return sensor_id; }
-       unsigned get_turnout_id() const { return turnout_id; }
-       TrackCircuit &get_sensor() const { return *sensor; }
-       const std::set<Track *> &get_tracks() const { return tracks; }
-       bool has_track(Track &) const;
+       unsigned get_sensor_address() const { return sensor_addr; }
+       unsigned get_turnout_address() const { return turnout_addr; }
+       TrackCircuit *get_sensor() const { return sensor; }
        const std::vector<Endpoint> &get_endpoints() const { return endpoints; }
        const Endpoint &get_endpoint(unsigned) const;
        int get_endpoint_by_link(Block &) const;
@@ -60,8 +66,10 @@ public:
        bool reserve(Train *);
        Train *get_train() const { return train; }
 private:
-       void find_paths(const TrackIter &, unsigned);
        void determine_id();
+
+public:
+       virtual Msp::DataFile::Statement save_reference() const;
 };
 
 } // namespace R2C2