X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftracktype.h;h=d13ea28c98354785075e08177ae514b985b92bf5;hb=8e3009751ee81e0e5312cae53ee844bdd9e49628;hp=582f77ae25b1a506bbd49b28c6fec8cfea3f57e7;hpb=e990eb02d42cc4b9ff679b947a6911f79472f8f5;p=r2c2.git

diff --git a/source/libmarklin/tracktype.h b/source/libmarklin/tracktype.h
index 582f77a..d13ea28 100644
--- a/source/libmarklin/tracktype.h
+++ b/source/libmarklin/tracktype.h
@@ -9,7 +9,8 @@ Distributed under the GPL
 #define LIBMARKLIN_TRACKTYPE_H_
 
 #include <msp/datafile/loader.h>
-#include "endpoint.h"
+#include "articlenumber.h"
+#include "geometry.h"
 #include "trackpart.h"
 
 namespace Marklin {
@@ -17,6 +18,15 @@ namespace Marklin {
 class TrackType
 {
 public:
+	struct Endpoint
+	{
+		Point pos;
+		float dir;  // Direction outwards from the endpoint
+		unsigned paths;
+
+		Endpoint(float, float, float, unsigned);
+	};
+
 	class Loader: public Msp::DataFile::BasicLoader<TrackType>
 	{
 	public:
@@ -28,25 +38,29 @@ public:
 	};
 
 private:
-	unsigned art_nr;
+	ArticleNumber art_nr;
 	std::string description;
 	std::vector<TrackPart> parts;
 	std::vector<Endpoint> endpoints;
 	bool double_address;
+	unsigned autofit_preference;
 
 public:
-	TrackType(unsigned);
+	TrackType(const ArticleNumber &);
 
-	unsigned get_article_number() const { return art_nr; }
+	const ArticleNumber &get_article_number() const { return art_nr; }
 	const std::string &get_description() const { return description; }
 	float get_total_length() const;
 	float get_path_length(int) const;
 	unsigned get_paths() const;
 	unsigned get_n_paths() const;
 	bool is_turnout() const;
+	bool is_dead_end() const;
 	bool is_double_address() const { return double_address; }
+	unsigned get_autofit_preference() const { return autofit_preference; }
 	const std::vector<TrackPart> &get_parts() const { return parts; }
 	const std::vector<Endpoint> &get_endpoints() const { return endpoints; }
+	const Endpoint &get_endpoint(unsigned) const;
 	TrackPoint get_point(unsigned, unsigned, float) const;
 
 private: