Move gauge to TrackAppearance

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

diff --git a/source/libr2c2/catalogue.h b/source/libr2c2/catalogue.h
index 12ee006f45f34a1fcb5e7e399f39356e470c3236..92d1149f1f4162a0030857782af9b95f472cc310 100644 (file)
--- a/source/libr2c2/catalogue.h
+++ b/source/libr2c2/catalogue.h
@@ -5,13 +5,11 @@
 #include <msp/datafile/objectloader.h>
 #include "articlenumber.h"
 #include "layout.h"
-#include "profile.h"
+#include "trackappearance.h"
 
 namespace R2C2 {
 
-class SignalType;
-class TrackType;
-class VehicleType;
+class ObjectType;
 
 class Catalogue
 {
@@ -21,34 +19,23 @@ public:
        public:
                Loader(Catalogue &);
        private:
-               void ballast_profile();
-               void gauge(float);
                void layout();
-               void rail_profile();
                void scale(float, float);
                void signal(ArticleNumber);
+               void terrain(ArticleNumber);
                void track(ArticleNumber);
+               void track_appearance();
                void vehicle(ArticleNumber);
        };
 
-       typedef std::map<ArticleNumber, TrackType *> TrackMap;
-       typedef std::map<ArticleNumber, VehicleType *> VehicleMap;
-       typedef std::map<ArticleNumber, SignalType *> SignalMap;
+       typedef std::map<ArticleNumber, ObjectType *> ObjectMap;
 
-       sigc::signal<void, const TrackType &> signal_track_added;
-       sigc::signal<void, const VehicleType &> signal_vehicle_added;
-       sigc::signal<void, const SignalType &> signal_signal_added;
+       sigc::signal<void, const ObjectType &> signal_object_added;
 
 private:
        float scale;
-       float gauge;
-       Profile rail_profile;
-       Profile ballast_profile;
-       Profile path_profile;
-       std::string track_technique;
-       TrackMap tracks;
-       VehicleMap vehicles;
-       SignalMap signals;
+       TrackAppearance appearance;
+       ObjectMap objects;
        Layout layout;
 
 public:
@@ -56,24 +43,14 @@ public:
        ~Catalogue();
 
        float get_scale() const { return scale; }
-       float get_gauge() const { return gauge; }
-       float get_rail_elevation() const;
-       const Profile &get_rail_profile() const { return rail_profile; }
-       const Profile &get_ballast_profile() const { return ballast_profile; }
-       const Profile &get_path_profile() const { return path_profile; }
-       const std::string &get_track_technique() const { return track_technique; }
 
-       void add_track(TrackType &);
-       const TrackType &get_track(const ArticleNumber &) const;
-       const TrackMap &get_tracks() const { return tracks; }
+       void add(ObjectType &);
+       const ObjectType &get(const ArticleNumber &) const;
+       const ObjectMap &get_all() const { return objects; }
 
-       void add_vehicle(VehicleType &);
-       const VehicleType &get_vehicle(const ArticleNumber &) const;
-       const VehicleMap &get_vehicles() const { return vehicles; }
-
-       void add_signal(SignalType &);
-       const SignalType &get_signal(const ArticleNumber &) const;
-       const SignalMap &get_signals() const { return signals; }
+       template<typename T>
+       const T &get(const ArticleNumber &an) const
+       { return dynamic_cast<const T &>(get(an)); }
 
        Layout &get_layout() { return layout; }
 };