X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Flayout.h;h=2fc761aebb4aa972c020105e62a7bc626f6d346e;hb=9b05c573a38639827697fe393d55b7c76f5bde45;hp=ae03cef6f30a2ca970656f7a6a9662255595ef9d;hpb=ae0600f7c3df5b6ef46992b1423888dd0e9a5026;p=r2c2.git

diff --git a/source/libmarklin/layout.h b/source/libmarklin/layout.h
index ae03cef..2fc761a 100644
--- a/source/libmarklin/layout.h
+++ b/source/libmarklin/layout.h
@@ -1,57 +1,115 @@
 /* $Id$
 
 This file is part of the MSP Märklin suite
-Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2010  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
 #ifndef LIBMARKLIN_LAYOUT_H_
 #define LIBMARKLIN_LAYOUT_H_
 
+#include <set>
 #include <sigc++/sigc++.h>
 #include <msp/datafile/loader.h>
-#include "route.h"
-#include "track.h"
+#include <msp/time/timestamp.h>
 
 namespace Marklin {
 
+class ArticleNumber;
+class Block;
 class Catalogue;
+class Driver;
+class Route;
+class Track;
+class Train;
+class Vehicle;
 
 class Layout
 {
 public:
-	class Loader: public Msp::DataFile::Loader
+	class Loader: public Msp::DataFile::BasicLoader<Layout>
 	{
+	private:
+		bool new_tracks;
+
 	public:
 		Loader(Layout &);
-		Layout &get_object() { return layout; }
 	private:
-		Layout &layout;
-
+		virtual void finish();
+		void route();
+		void route(const std::string &);
 		void track(unsigned);
+		void track(ArticleNumber);
+		void train(unsigned, unsigned, const std::string &);
+		void train(ArticleNumber, unsigned, const std::string &);
 	};
 
+public:
+	sigc::signal<void, Track &> signal_track_added;
+	sigc::signal<void, Track &> signal_track_removed;
+	sigc::signal<void, Route &> signal_route_added;
+	sigc::signal<void, Route &> signal_route_removed;
+	sigc::signal<void, Train &> signal_train_added;
+	sigc::signal<void, Train &> signal_train_removed;
+	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, const std::string &> signal_emergency;
+
 private:
-	Catalogue   &catalogue;
-	std::string filename;
+	Catalogue &catalogue;
+	Driver *driver;
 	std::string base;
 	std::set<Track *> tracks;
-	//RouteSeq    routes;
+	std::set<Route *> routes;
+	std::set<Block *> blocks;
+	std::map<unsigned, Train *> trains;
+	std::set<Vehicle *> vehicles;
+	Msp::Time::TimeStamp last_tick;
+	unsigned next_turnout_id;
 
 public:
-	sigc::signal<void, Track &> signal_track_added;
-	sigc::signal<void, Track &> signal_track_removed;
-
-	Layout(Catalogue &);
+	Layout(Catalogue &, Driver * = 0);
 	~Layout();
 
+	Catalogue &get_catalogue() const { return catalogue; }
+	bool has_driver() const { return driver; }
+	Driver &get_driver() const;
 	const std::string &get_base() const { return base; }
+
+	void add_track(Track &);
 	const std::set<Track *> &get_tracks() const { return tracks; }
-	void  add_track(Track &);
-	void  remove_track(Track &);
-	void  check_links();
-	void  load(const std::string &);
-	int   save(const std::string &);
+	void remove_track(Track &);
+	unsigned allocate_turnout_id(bool);
+
+	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_train(Train &);
+	Train &get_train(unsigned) const;
+	const std::map<unsigned, Train *> &get_trains() const { return trains; }
+	void remove_train(Train &);
+
+	void add_vehicle(Vehicle &);
+	void remove_vehicle(Vehicle &);
+
+	void tick();
+	void emergency(const std::string &);
+
+	void save(const std::string &);
+	void save_trains(const std::string &);
+private:
+	void sensor_event(unsigned, bool);
 };
 
 } // namespace Marklin