Rework article numbers

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

diff --git a/source/libr2c2/tracktype.h b/source/libr2c2/tracktype.h
index 64efe8c1907f27541d08af89a2898aa4c02040ac..b540e291bd4bf75bef03440ef9530c91321e61a1 100644 (file)
--- a/source/libr2c2/tracktype.h
+++ b/source/libr2c2/tracktype.h
@@ -28,20 +28,27 @@ public:
 
        class Loader: public Msp::DataFile::DerivedObjectLoader<TrackType, ObjectType::Loader>
        {
+       public:
+               typedef Msp::DataFile::Collection Collection;
+
        private:
+               Collection &coll;
                bool state_bits_set;
 
        public:
-               Loader(TrackType &);
+               Loader(TrackType &, Collection &);
+
+               virtual Collection &get_collection() const { return coll; }
        private:
                virtual void finish();
+               void appearance(const std::string &);
                void part();
                void position(float, float, float);
                void state_bits(unsigned);
        };
 
 private:
-       const TrackAppearance &appearance;
+       const TrackAppearance *appearance;
        std::vector<TrackPart> parts;
        std::vector<Endpoint> endpoints;
        unsigned state_bits;
@@ -49,13 +56,15 @@ private:
        std::string object;
 
 public:
-       TrackType(const ArticleNumber &, const TrackAppearance &);
+       TrackType();
 
-       const TrackAppearance &get_appearance() const { return appearance; }
+       const TrackAppearance &get_appearance() const;
+       float get_gauge() const;
        float get_total_length() const;
        float get_path_length(int) const;
        unsigned get_paths() const;
        unsigned get_n_paths() const;
+       unsigned coerce_path(unsigned, unsigned) const;
        unsigned get_state_bits() const { return state_bits; }
        bool is_turnout() const;
        bool is_dead_end() const;