X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Fcatalogue.h;h=e531941b40fb6e1c072491f90094b2ae8164ce1a;hb=c0c5a34d1056eabdebd350da3534e24c902c0dac;hp=4ce6fb1b712de8daa3d32f988d5ec5d43f0b6623;hpb=65cbaf88a03497df08243ac27354b0c0ea1f640b;p=r2c2.git

diff --git a/source/libmarklin/catalogue.h b/source/libmarklin/catalogue.h
index 4ce6fb1..e531941 100644
--- 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,6 +10,8 @@ Distributed under the GPL
 
 #include <map>
 #include <msp/datafile/loader.h>
+#include "layout.h"
+#include "profile.h"
 
 namespace Marklin {
 
@@ -24,21 +26,37 @@ public:
 	public:
 		Loader(Catalogue &);
 	private:
+		void ballast_profile();
+		void gauge(float);
+		void layout();
 		void locomotive(unsigned);
+		void rail_profile();
+		void scale(float, float);
 		void track(unsigned);
 	};
 
 private:
+	float scale;
+	float gauge;
+	Profile rail_profile;
+	Profile ballast_profile;
 	std::map<unsigned, TrackType *> tracks;
 	std::map<unsigned, LocoType *> locos;
+	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; }
 	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; }
+	Layout &get_layout() { return layout; }
 };
 
 } // namespace Marklin