X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrack.h;h=21c505fb9ae12c180ed955e632aab989d0684b03;hb=02c9a9779954d993cb73fe5f7a72b0847e87f633;hp=c434224b527cf272a31b136eda574d977301700b;hpb=3e9c210ddc036cd015228504cc0803c909e27f84;p=r2c2.git

diff --git a/source/libmarklin/track.h b/source/libmarklin/track.h
index c434224..21c505f 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-2008 Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2009 Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
@@ -20,67 +20,67 @@ class TrackType;
 class Track
 {
 public:
-	class Loader: public Msp::DataFile::Loader
+	class Loader: public Msp::DataFile::BasicLoader<Track>
 	{
-	private:
-		Track &track;
-
 	public:
 		Loader(Track &);
-		Track &get_object() { return track; }
 	private:
 		void position(float, float, float);
 	};
 
 private:
 	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;
 
+	// Direct copying not allowed due to links.  See the copy() function.
+	Track(const Track &);
+	Track &operator=(const Track &);
 public:
 	Track(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();
+
+	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; }
+
+	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;
+	Track *get_link(unsigned) const;
+	unsigned 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;
-private:
 
-	// Direct copying not allowed due to links.  See the copy() function.
-	Track(const Track &);
-	Track &operator=(const Track &);
+	void save(std::list<Msp::DataFile::Statement> &) const;
 };
 
 } // namespace Marklin