Full vehicle unification

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

diff --git a/source/libmarklin/catalogue.h b/source/libmarklin/catalogue.h
index 5f13999dd26e7ed91fd648c60eec766d066d022a..d529cfc07969e18f8c17983359aadc5cd543e45b 100644 (file)
--- a/source/libmarklin/catalogue.h
+++ b/source/libmarklin/catalogue.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of the MSP Märklin suite
-Copyright © 2006-2009  Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2010  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
@@ -10,11 +10,13 @@ Distributed under the GPL
 
 #include <map>
 #include <msp/datafile/loader.h>
+#include "layout.h"
+#include "profile.h"
 
 namespace Marklin {
 
-class LocoType;
 class TrackType;
+class VehicleType;
 
 class Catalogue
 {
@@ -24,22 +26,47 @@ public:
        public:
                Loader(Catalogue &);
        private:
-               void locomotive(unsigned);
+               void ballast_profile();
+               void gauge(float);
+               void layout();
+               void rail_profile();
+               void scale(float, float);
                void track(unsigned);
+               void vehicle(unsigned);
        };
 
+       sigc::signal<void, const TrackType &> signal_track_added;
+       sigc::signal<void, const VehicleType &> signal_vehicle_added;
+
 private:
+       float scale;
+       float gauge;
+       Profile rail_profile;
+       Profile ballast_profile;
+       Profile path_profile;
        std::map<unsigned, TrackType *> tracks;
-       std::map<unsigned, LocoType *> locos;
+       std::map<unsigned, VehicleType *> vehicles;
+       Layout layout;
 
 public:
+       Catalogue();
        ~Catalogue();
 
-       TrackType &get_track(unsigned) const;
+       float get_scale() const { return scale; }
+       float get_gauge() const { return gauge; }
+       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; }
+
+       void add_track(TrackType &);
+       const TrackType &get_track(unsigned) const;
        const std::map<unsigned, TrackType *> &get_tracks() const { return tracks; }
-       LocoType &get_locomotive(unsigned) const;
-       const std::map<unsigned, LocoType *> &get_locomotives() const { return locos; }
-       void  load(const std::string &);
+
+       void add_vehicle(VehicleType &);
+       const VehicleType &get_vehicle(unsigned) const;
+       const std::map<unsigned, VehicleType *> &get_vehicles() const { return vehicles; }
+
+       Layout &get_layout() { return layout; }
 };
 
 } // namespace Marklin