X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Fblock.h;h=2aed9a40df680f3a769befd02cbe0357b30dd5fd;hb=e392d397f6b86a49a05e9738357ccbfc2a922f01;hp=df3ed4a525444271c931d4dd02a6c4e70dd5d63b;hpb=78bc40c2d1a5fcc5715143bd2326716fbb143730;p=r2c2.git

diff --git a/source/libmarklin/block.h b/source/libmarklin/block.h
index df3ed4a..2aed9a4 100644
--- a/source/libmarklin/block.h
+++ b/source/libmarklin/block.h
@@ -1,5 +1,12 @@
-#ifndef MARKLIN_3D_SECTION_H_
-#define MARKLIN_3D_SECTION_H_
+/* $Id$
+
+This file is part of the MSP Märklin suite
+Copyright © 2006-2010  Mikkosoft Productions, Mikko Rasa
+Distributed under the GPL
+*/
+
+#ifndef LIBMARKLIN_BLOCK_H_
+#define LIBMARKLIN_BLOCK_H_
 
 #include <list>
 #include <set>
@@ -7,8 +14,10 @@
 
 namespace Marklin {
 
+class Layout;
+class Route;
+class TrackIter;
 class Train;
-class TrafficManager;
 
 class Block
 {
@@ -16,35 +25,44 @@ public:
 	struct Endpoint
 	{
 		Track *track;
-		const Track::Endpoint *track_ep;
-		Block  *link;
-		unsigned routes;
+		unsigned track_ep;
+		Block *link;
+		unsigned paths;
 
-		Endpoint(Track *, const Track::Endpoint *);
+		Endpoint(Track *, unsigned);
 	};
-	typedef std::list<Endpoint> EndpointSeq;
 
-	Block(TrafficManager &, Track *);
+private:
+	Layout &layout;
+	unsigned id;
+	unsigned sensor_id;
+	unsigned turnout_id;
+	std::set<Track *> tracks;
+	std::vector<Endpoint> endpoints;
+	Train *train;
+
+public:
+	Block(Layout &, Track &);
+	~Block();
+
+	unsigned get_id() const { return id; }
 	unsigned get_sensor_id() const { return sensor_id; }
-	const TrackSet &get_tracks() const { return tracks; }
-	const Endpoint *get_endpoint_by_link(const Block *) const;
-	const Endpoint *traverse(const Endpoint *) const;
+	unsigned get_turnout_id() const { return turnout_id; }
+	const std::set<Track *> &get_tracks() const { return tracks; }
+	bool has_track(Track &) const;
+	const std::vector<Endpoint> &get_endpoints() const { return endpoints; }
+	int get_endpoint_by_link(Block &) const;
+	float get_path_length(unsigned, const Route * = 0) const;
 	void check_link(Block &);
-	bool reserve(const Train *);
+	void break_link(Block &);
+	Block *get_link(unsigned) const;
+	bool reserve(Train *);
+	Train *get_train() const { return train; }
 	void print_debug();
 private:
-	TrafficManager &trfc_mgr;
-	unsigned       id;
-	unsigned       sensor_id;
-	TrackSet       tracks;
-	EndpointSeq    endpoints;
-	const Train    *train;
-
-	void find_routes(Track *, const Track::Endpoint *, unsigned, TrackSet &);
-
-	static unsigned next_id;
+	void find_paths(TrackIter, unsigned);
+	void determine_id();
 };
-typedef std::list<Block *> BlockSeq;
 
 } // namespace Marklin