Support more complex article numbers

[r2c2.git] / source / libmarklin / tracktype.h

diff --git a/source/libmarklin/tracktype.h b/source/libmarklin/tracktype.h
index 902a2f6ddd561df38ecb1c84dbdfbb0fb3d2c79b..b1aff1e0920e3229113c517d5fb228c62a511501 100644 (file)
--- a/source/libmarklin/tracktype.h
+++ b/source/libmarklin/tracktype.h
@@ -9,6 +9,7 @@ Distributed under the GPL
 #define LIBMARKLIN_TRACKTYPE_H_
 
 #include <msp/datafile/loader.h>
+#include "articlenumber.h"
 #include "geometry.h"
 #include "trackpart.h"
 
@@ -37,16 +38,17 @@ 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;
@@ -55,6 +57,7 @@ public:
        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; }
        TrackPoint get_point(unsigned, unsigned, float) const;