Full vehicle unification

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

diff --git a/source/libmarklin/catalogue.h b/source/libmarklin/catalogue.h
index 1a328bba1a70431b7486b55e3b78762a4049d8b0..d529cfc07969e18f8c17983359aadc5cd543e45b 100644 (file)
--- a/source/libmarklin/catalogue.h
+++ b/source/libmarklin/catalogue.h
@@ -1,33 +1,72 @@
+/* $Id$
+
+This file is part of the MSP Märklin suite
+Copyright © 2006-2010  Mikkosoft Productions, Mikko Rasa
+Distributed under the GPL
+*/
+
 #ifndef LIBMARKLIN_CATALOGUE_H_
 #define LIBMARKLIN_CATALOGUE_H_
 
 #include <map>
-#include <msp/parser/loader.h>
+#include <msp/datafile/loader.h>
+#include "layout.h"
+#include "profile.h"
 
 namespace Marklin {
 
-class Track;
+class TrackType;
+class VehicleType;
 
 class Catalogue
 {
 public:
-       class Loader: public Msp::Parser::Loader
+       class Loader: public Msp::DataFile::BasicLoader<Catalogue>
        {
        public:
                Loader(Catalogue &);
        private:
-               Catalogue &cat;
-
+               void ballast_profile();
+               void gauge(float);
+               void layout();
+               void rail_profile();
+               void scale(float, float);
                void track(unsigned);
+               void vehicle(unsigned);
        };
-       typedef std::map<unsigned, Track *> TrackMap;
 
-       Track *get_track(unsigned);
-       const TrackMap &get_tracks() const { return tracks; }
-       void  load(const std::string &);
-       ~Catalogue();
+       sigc::signal<void, const TrackType &> signal_track_added;
+       sigc::signal<void, const VehicleType &> signal_vehicle_added;
+
 private:
-       TrackMap tracks;
+       float scale;
+       float gauge;
+       Profile rail_profile;
+       Profile ballast_profile;
+       Profile path_profile;
+       std::map<unsigned, TrackType *> tracks;
+       std::map<unsigned, VehicleType *> vehicles;
+       Layout layout;
+
+public:
+       Catalogue();
+       ~Catalogue();
+
+       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; }
+
+       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