X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Flayout.h;h=b89cacb90b1d11a5c1279d0ff2c11b5f9f9ef464;hb=64340dad429ba4040538fc06b6882aabdb489925;hp=ecb801f0e07c5bc8d4c4af4f9edb300967fba6db;hpb=7e27b311e33beda1746eb63e0945633f262427f6;p=r2c2.git

diff --git a/source/libr2c2/layout.h b/source/libr2c2/layout.h
index ecb801f..b89cacb 100644
--- a/source/libr2c2/layout.h
+++ b/source/libr2c2/layout.h
@@ -1,34 +1,28 @@
-/* $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"
 
 namespace R2C2 {
 
 class ArticleNumber;
-class Block;
 class Catalogue;
 class Driver;
 class Route;
 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;
@@ -43,6 +37,7 @@ public:
 		void track(ArticleNumber);
 		void train(unsigned, unsigned, const std::string &);
 		void train(ArticleNumber, unsigned, const std::string &);
+		void turnout(unsigned, unsigned);
 		void zone();
 	};
 
@@ -60,6 +55,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:
@@ -86,8 +82,9 @@ 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(bool);
+	unsigned allocate_turnout_id();
 
 	void add_block(Block &);
 	Block &get_block(unsigned) const;
@@ -120,9 +117,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