Make use of the mspmath library

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

diff --git a/source/libr2c2/layout.h b/source/libr2c2/layout.h
index 6ef7e0900b517e4015e58874de66be306d193b26..48a2796dcb7003affb134f99471e03ebcefb3324 100644 (file)
--- a/source/libr2c2/layout.h
+++ b/source/libr2c2/layout.h
@@ -1,25 +1,20 @@
-/* $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"
+#include "geometry.h"
 
 namespace R2C2 {
 
 class ArticleNumber;
-class Block;
 class Catalogue;
 class Driver;
 class Route;
+class Signal;
 class Track;
 class Train;
 class Vehicle;
@@ -28,7 +23,7 @@ class Zone;
 class Layout
 {
 public:
-       class Loader: public Msp::DataFile::BasicLoader<Layout>
+       class Loader: public Msp::DataFile::ObjectLoader<Layout>
        {
        private:
                bool new_tracks;
@@ -36,13 +31,14 @@ public:
        public:
                Loader(Layout &);
        private:
-               virtual void finish();
                void route();
                void route(const std::string &);
+               void signal(ArticleNumber);
                void track(unsigned);
                void track(ArticleNumber);
                void train(unsigned, unsigned, const std::string &);
                void train(ArticleNumber, unsigned, const std::string &);
+               void turnout(unsigned, unsigned);
                void zone();
        };
 
@@ -51,6 +47,8 @@ public:
 
        sigc::signal<void, Track &> signal_track_added;
        sigc::signal<void, Track &> signal_track_removed;
+       sigc::signal<void, Signal &> signal_signal_added;
+       sigc::signal<void, Signal &> signal_signal_removed;
        sigc::signal<void, Route &> signal_route_added;
        sigc::signal<void, Route &> signal_route_removed;
        sigc::signal<void, Zone &> signal_zone_added;
@@ -60,6 +58,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:
@@ -67,6 +66,7 @@ private:
        Driver *driver;
        std::string base;
        std::set<Track *> tracks;
+       std::set<Signal *> signals;
        std::set<Route *> routes;
        ZoneSet zones;
        std::set<Block *> blocks;
@@ -86,9 +86,22 @@ 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();
 
+       void add_signal(Signal &);
+       const std::set<Signal *> &get_signals() const { return signals; }
+       Signal *pick_signal(const Vector &, const Vector &);
+       void remove_signal(Signal &);
+
+       Object *pick_object(const Vector &, const Vector &);
+
+private:
+       template<typename T>
+       static T *pick(const std::set<T *> &, const Vector &, const Vector &);
+
+public:
        void add_block(Block &);
        Block &get_block(unsigned) const;
        const std::set<Block *> &get_blocks() const { return blocks; }
@@ -120,9 +133,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