X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Flibr2c2%2Flayout.h;h=59eae083d05253b6d8c7d5a5e80ad0498d136c94;hb=8a31a3ab3ab7abda30de0ed3a6d0753760f3bb1d;hp=204a60f6d90b9e64718386cbeb384c3f511fa570;hpb=eb9c7f5200da4f3f31b41233be8cee397cb6abb9;p=r2c2.git

diff --git a/source/libr2c2/layout.h b/source/libr2c2/layout.h
index 204a60f..59eae08 100644
--- a/source/libr2c2/layout.h
+++ b/source/libr2c2/layout.h
@@ -7,10 +7,12 @@
 #include <msp/time/timestamp.h>
 #include "geometry.h"
 #include "sensor.h"
+#include "clock.h"
 
 namespace R2C2 {
 
 class ArticleNumber;
+class BeamGate;
 class Block;
 class Catalogue;
 class Driver;
@@ -28,18 +30,13 @@ class Layout
 public:
 	class Loader: public Msp::DataFile::ObjectLoader<Layout>
 	{
-	private:
-		bool new_tracks;
-
 	public:
 		Loader(Layout &);
 	private:
+		void beamgate();
 		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();
@@ -84,6 +81,7 @@ public:
 private:
 	Catalogue &catalogue;
 	Driver *driver;
+	Clock clock;
 	std::string base;
 	Storage<Object> objects;
 	Storage<TrackChain> track_chains;
@@ -99,6 +97,7 @@ 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 &);
@@ -106,6 +105,7 @@ public:
 	void add(TrackChain &);
 	void add(Block &);
 	void add(Sensor &);
+	void add(BeamGate &);
 
 	template<typename T>
 	const std::set<T *> &get_all() const;
@@ -117,6 +117,7 @@ public:
 	void remove(Track &);
 	void remove(TrackChain &);
 	void remove(Sensor &);
+	void remove(BeamGate &);
 
 	unsigned allocate_turnout_id();