X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Fblock.h;h=23a48c0ffbc40344ee3c98a04c5e6833a3173613;hb=2029c5e4220e0809a39744a28ca9e2ff22e8ad28;hp=68c57b88e39c102f8d38e5f8b75f00c93fd51afd;hpb=7839b7c3d782abb5c98a24d51cae109407068c02;p=r2c2.git

diff --git a/source/libmarklin/block.h b/source/libmarklin/block.h
index 68c57b8..23a48c0 100644
--- a/source/libmarklin/block.h
+++ b/source/libmarklin/block.h
@@ -1,12 +1,12 @@
 /* $Id$
 
 This file is part of the MSP Märklin suite
-Copyright © 2006-2009  Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2010  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
-#ifndef MARKLIN_3D_BLOCK_H_
-#define MARKLIN_3D_BLOCK_H_
+#ifndef LIBMARKLIN_BLOCK_H_
+#define LIBMARKLIN_BLOCK_H_
 
 #include <list>
 #include <set>
@@ -14,49 +14,54 @@ Distributed under the GPL
 
 namespace Marklin {
 
+class Layout;
+class Route;
 class Train;
-class TrafficManager;
 
 class Block
 {
 public:
 	struct Endpoint
 	{
-		Track    *track;
+		Track *track;
 		unsigned track_ep;
-		Block    *link;
-		unsigned routes;
+		Block *link;
+		unsigned paths;
 
 		Endpoint(Track *, unsigned);
 	};
 
 private:
-	TrafficManager &trfc_mgr;
-	unsigned       id;
-	unsigned       sensor_id;
-	unsigned       turnout_id;
-	std::set<Track *>     tracks;
+	Layout &layout;
+	unsigned id;
+	unsigned sensor_id;
+	unsigned turnout_id;
+	std::set<Track *> tracks;
 	std::vector<Endpoint> endpoints;
-	const Train    *train;
+	Train *train;
 
 public:
-	Block(TrafficManager &, Track &);
+	Block(Layout &, Track &);
+	~Block();
 
+	unsigned get_id() const { return id; }
 	unsigned get_sensor_id() const { return sensor_id; }
 	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(const Block &) const;
-	int traverse(unsigned, float * =0) const;
+	int get_endpoint_by_link(Block &) const;
+	unsigned traverse(unsigned, float * =0) const;
+	unsigned traverse(unsigned, const Route *, float * =0) const;
 	void check_link(Block &);
+	void break_link(Block &);
 	Block *get_link(unsigned) const;
-	bool reserve(const Train *);
-	const Train *get_train() const { return train; }
+	bool reserve(Train *);
+	Train *get_train() const { return train; }
 	void print_debug();
 private:
-	void find_routes(Track &, unsigned, unsigned, std::set<Track *> &);
-
-	static unsigned next_id;
+	void find_paths(Track &, unsigned, unsigned, std::set<Track *> &);
+	void determine_id();
 };
 
 } // namespace Marklin