Use generic ObjectTypes in Catalogue

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

diff --git a/source/libr2c2/catalogue.h b/source/libr2c2/catalogue.h
index d13c9821d67cad4c3cc09fcb4d42e57902cdb52a..dcde9f38f9600dfac5a2a7f761e72ec0c54738c5 100644 (file)
--- a/source/libr2c2/catalogue.h
+++ b/source/libr2c2/catalogue.h
@@ -9,9 +9,7 @@
 
 namespace R2C2 {
 
-class SignalType;
-class TrackType;
-class VehicleType;
+class ObjectType;
 
 class Catalogue
 {
@@ -31,13 +29,9 @@ public:
                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;
@@ -45,9 +39,7 @@ private:
        Profile rail_profile;
        Profile ballast_profile;
        std::string track_technique;
-       TrackMap tracks;
-       VehicleMap vehicles;
-       SignalMap signals;
+       ObjectMap objects;
        Layout layout;
 
 public:
@@ -61,17 +53,13 @@ public:
        const Profile &get_ballast_profile() const { return ballast_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; }
 };