X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrack.h;h=7ef511919986adefcff8fd4eec5627e16db5dad6;hb=651698847d5293cfb15b6fb23a394701388c0151;hp=3c96a82d2cec51f6463c3e958d1b417c3ebb003a;hpb=3df8cb5c78fbb0b919bcb79677c6c788b8028482;p=r2c2.git

diff --git a/source/libmarklin/track.h b/source/libmarklin/track.h
index 3c96a82..7ef5119 100644
--- a/source/libmarklin/track.h
+++ b/source/libmarklin/track.h
@@ -1,7 +1,7 @@
 /* $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
 */
 
@@ -10,14 +10,16 @@ Distributed under the GPL
 
 #include <list>
 #include <set>
+#include <sigc++/trackable.h>
 #include <msp/datafile/loader.h>
 #include "geometry.h"
 
 namespace Marklin {
 
+class Layout;
 class TrackType;
 
-class Track
+class Track: public sigc::trackable
 {
 public:
 	class Loader: public Msp::DataFile::BasicLoader<Track>
@@ -26,60 +28,62 @@ public:
 		Loader(Track &);
 	private:
 		void position(float, float, float);
+		void sensor_id(unsigned);
+		void turnout_id(unsigned);
 	};
 
 private:
+	Layout &layout;
 	const TrackType &type;
-	Point        pos;
-	float        rot;
-	float        slope;
-	bool         flex;
-	unsigned     turnout_id;
-	unsigned     sensor_id;
+	Point pos;
+	float rot;
+	float slope;
+	bool flex;
+	unsigned turnout_id;
+	unsigned sensor_id;
 	std::vector<Track *> links;
+	unsigned active_path;
 
+	Track(const Track &);
+	Track &operator=(const Track &);
 public:
-	Track(const TrackType &);
+	Track(Layout &, const TrackType &);
 	~Track();
 
 	const TrackType &get_type() const { return type; }
-	void            set_position(const Point &);
-	const Point     &get_position() const      { return pos; }
-	void            set_rotation(float);
-	float           get_rotation() const       { return rot; }
-	void            set_slope(float);
-	float           get_slope() const          { return slope; }
-	void            set_flex(bool);
-	bool            get_flex() const           { return flex; }
-	void            set_turnout_id(unsigned);
-	unsigned        get_turnout_id() const     { return turnout_id; }
-	void            set_sensor_id(unsigned);
-	unsigned        get_sensor_id() const      { return sensor_id; }
-	int             get_endpoint_by_link(const Track &) const;
-	Point           get_endpoint_position(unsigned) const;
-	float           get_endpoint_direction(unsigned) const;
-	bool            snap_to(Track &, bool);
-	bool            snap(Point &, float &) const;
-	void            break_link(Track &);
-	void            break_links();
-	const std::vector<Track *> &get_links() const { return links; }
-	Track           *get_link(unsigned) const;
-	void            check_slope();
-	int             traverse(unsigned, unsigned) const;
-	Point           get_point(unsigned, unsigned, float) const;
 
-	/**
-	Creates a copy of the track.  The new track will be almost identical, but
-	won't have any links to other tracks, nor a turnout or sensor id.
-	*/
-	Track *copy() const;
+	void set_position(const Point &);
+	void set_rotation(float);
+	void set_slope(float);
+	void set_flex(bool);
+	const Point &get_position() const { return pos; }
+	float get_rotation() const { return rot; }
+	float get_slope() const { return slope; }
+	bool get_flex() const { return flex; }
+	void check_slope();
+
+	void set_turnout_id(unsigned);
+	void set_sensor_id(unsigned);
+	unsigned get_turnout_id() const { return turnout_id; }
+	unsigned get_sensor_id() const { return sensor_id; }
+	void set_active_path(unsigned);
+	unsigned get_active_path() const { return active_path; }
+
+	int get_endpoint_by_link(const Track &) const;
+	Point get_endpoint_position(unsigned) const;
+	float get_endpoint_direction(unsigned) const;
+	bool snap_to(Track &, bool);
+	bool snap(Point &, float &) const;
+	void break_link(Track &);
+	void break_links();
+	const std::vector<Track *> &get_links() const { return links; }
+	Track *get_link(unsigned) const;
+	unsigned traverse(unsigned, unsigned) const;
+	Point get_point(unsigned, unsigned, float) const;
 
 	void save(std::list<Msp::DataFile::Statement> &) const;
 private:
-
-	// Direct copying not allowed due to links.  See the copy() function.
-	Track(const Track &);
-	Track &operator=(const Track &);
+	void turnout_event(unsigned, bool);
 };
 
 } // namespace Marklin