X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Flayout.h;h=8e44fb52d26dc362a9258f50017d2e9fef1271de;hb=54392d65e2053d1eacb4cfcc435f1013993f2973;hp=f0a292f580e9847507a57f3acb49c64d175b54eb;hpb=277e8e7e4230aa8867f507ace62476afe575cff1;p=r2c2.git

diff --git a/source/libr2c2/layout.h b/source/libr2c2/layout.h
index f0a292f..8e44fb5 100644
--- a/source/libr2c2/layout.h
+++ b/source/libr2c2/layout.h
@@ -1,35 +1,29 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2006-2011  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 Vector;
 class Vehicle;
 class Zone;
 
 class Layout
 {
 public:
-	class Loader: public Msp::DataFile::BasicLoader<Layout>
+	class Loader: public Msp::DataFile::ObjectLoader<Layout>
 	{
 	private:
 		bool new_tracks;
@@ -37,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 &);
@@ -53,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;
@@ -62,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:
@@ -69,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;
@@ -88,10 +86,22 @@ public:
 
 	void add_track(Track &);
 	const std::set<Track *> &get_tracks() const { return tracks; }
-	Track *pick_track(const Vector &, const Vector &);
+	Track *pick_track(const Ray &);
 	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 Ray &);
+	void remove_signal(Signal &);
+
+	Object *pick_object(const Ray &);
+
+private:
+	template<typename T>
+	static T *pick(const std::set<T *> &, const Ray &);
+
+public:
 	void add_block(Block &);
 	Block &get_block(unsigned) const;
 	const std::set<Block *> &get_blocks() const { return blocks; }
@@ -125,7 +135,7 @@ public:
 	void save(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