X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Flayout.h;h=5573673f0f7a4c2987d6355388e2e3c4df7c94d0;hb=8b7d4054b05002d82338775ac9b4ee764a8560e4;hp=02a4654e2d8f6ea63000b183d662511960e1a620;hpb=d15ac13f2e170f155b4bbd124df48400c339b644;p=r2c2.git

diff --git a/source/libr2c2/layout.h b/source/libr2c2/layout.h
index 02a4654..5573673 100644
--- a/source/libr2c2/layout.h
+++ b/source/libr2c2/layout.h
@@ -3,7 +3,7 @@
 
 #include <set>
 #include <sigc++/sigc++.h>
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
 #include <msp/time/timestamp.h>
 #include "block.h"
 
@@ -13,6 +13,7 @@ class ArticleNumber;
 class Catalogue;
 class Driver;
 class Route;
+class Signal;
 class Track;
 class Train;
 class Vector;
@@ -22,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;
@@ -30,9 +31,9 @@ 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 &);
@@ -46,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;
@@ -63,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,6 +90,18 @@ public:
 	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; }