X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Flayout.h;h=7c61c4fdecf8ead4c767efc77ba564849a417f65;hb=0c2a3e6c435fd4cf05cc5275f750d341842aa543;hp=f9a2ba1bd5f7cf73f06dbd39956c0afa4166cffb;hpb=e214fd389b9819eac0379cfb78e0f446e267b839;p=r2c2.git

diff --git a/source/libr2c2/layout.h b/source/libr2c2/layout.h
index f9a2ba1..7c61c4f 100644
--- a/source/libr2c2/layout.h
+++ b/source/libr2c2/layout.h
@@ -7,6 +7,7 @@
 #include <msp/time/timestamp.h>
 #include "geometry.h"
 #include "sensor.h"
+#include "clock.h"
 
 namespace R2C2 {
 
@@ -18,6 +19,7 @@ class Object;
 class Route;
 class Signal;
 class Track;
+class TrackChain;
 class Train;
 class Vehicle;
 class Zone;
@@ -68,15 +70,12 @@ private:
 	};
 
 public:
-	typedef std::set<Zone *> ZoneSet;
 	typedef std::vector<Zone *> ZoneArray;
 
 	sigc::signal<void, Object &> signal_object_added;
 	sigc::signal<void, Object &> signal_object_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, TrackChain &> signal_track_chain_added;
+	sigc::signal<void, TrackChain &> signal_track_chain_removed;
 	sigc::signal<void, Train &> signal_train_added;
 	sigc::signal<void, Train &> signal_train_removed;
 	sigc::signal<void, Block &, Train *> signal_block_reserved;
@@ -86,12 +85,11 @@ public:
 private:
 	Catalogue &catalogue;
 	Driver *driver;
+	Clock clock;
 	std::string base;
 	Storage<Object> objects;
-	std::set<Route *> routes;
-	ZoneSet zones;
-	std::set<Block *> blocks;
-	std::set<Sensor *> sensors;
+	Storage<TrackChain> track_chains;
+	Storage<Sensor> sensors;
 	std::map<unsigned, Train *> trains;
 	Msp::Time::TimeStamp last_tick;
 	unsigned next_turnout_id;
@@ -103,10 +101,14 @@ public:
 	Catalogue &get_catalogue() const { return catalogue; }
 	bool has_driver() const { return driver; }
 	Driver &get_driver() const;
+	const Clock &get_clock() const { return clock; }
 	const std::string &get_base() const { return base; }
 
 	void add(Object &);
 	void add(Track &);
+	void add(TrackChain &);
+	void add(Block &);
+	void add(Sensor &);
 
 	template<typename T>
 	const std::set<T *> &get_all() const;
@@ -116,36 +118,26 @@ public:
 
 	void remove(Object &);
 	void remove(Track &);
+	void remove(TrackChain &);
+	void remove(Sensor &);
 
 	unsigned allocate_turnout_id();
 
-	void add_block(Block &);
 	Block &get_block(unsigned) const;
-	const std::set<Block *> &get_blocks() const { return blocks; }
 	void create_blocks();
 	void create_blocks(Track &);
-	void remove_block(Block &);
 
-	void add_route(Route &);
-	const std::set<Route *> &get_routes() const { return routes; }
 	Route &get_route(const std::string &) const;
 	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; }
 	void remove_train(Train &);
 
-	void add_sensor(Sensor &);
-	void remove_sensor(Sensor &);
-
 	void tick();
 	void emergency(const std::string &);