X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fcatalogue.h;h=46cdb5fb21c150d2d10c974b4969569b65d176af;hb=508ee4bfcc0f8fb1373fb7af251c59c873ef896f;hp=21ebd38a90a6382c931f08809ac46e25051b7036;hpb=d405b9943c888e3945c7ea4e496f9d300b114fe0;p=r2c2.git

diff --git a/source/libr2c2/catalogue.h b/source/libr2c2/catalogue.h
index 21ebd38..46cdb5f 100644
--- a/source/libr2c2/catalogue.h
+++ b/source/libr2c2/catalogue.h
@@ -1,60 +1,44 @@
 #ifndef LIBR2C2_CATALOGUE_H_
 #define LIBR2C2_CATALOGUE_H_
 
-#include <map>
-#include <msp/datafile/objectloader.h>
-#include "articlenumber.h"
+#include <msp/datafile/collection.h>
+#include <msp/datafile/collectionsource.h>
+#include <msp/fs/path.h>
 #include "layout.h"
-#include "trackappearance.h"
 
 namespace R2C2 {
 
 class ObjectType;
 
-class Catalogue
+class Catalogue: public Msp::DataFile::Collection
 {
 public:
-	class Loader: public Msp::DataFile::ObjectLoader<Catalogue>
+	class Loader: public Msp::DataFile::Collection::Loader
 	{
+	private:
+		Catalogue &cat;
+
 	public:
 		Loader(Catalogue &);
 	private:
-		void gauge(float);
 		void layout();
 		void scale(float, float);
-		void signal(ArticleNumber);
-		void terrain(ArticleNumber);
-		void track(ArticleNumber);
-		void track_appearance();
-		void vehicle(ArticleNumber);
 	};
 
-	typedef std::map<ArticleNumber, ObjectType *> ObjectMap;
-
-	sigc::signal<void, const ObjectType &> signal_object_added;
+	sigc::signal<void, Msp::DataFile::CollectionSource &> signal_source_added;
 
 private:
 	float scale;
-	float gauge;
-	TrackAppearance appearance;
-	ObjectMap objects;
 	Layout layout;
+	std::list<Msp::DataFile::CollectionSource *> sources;
 
 public:
 	Catalogue();
-	~Catalogue();
 
-	float get_scale() const { return scale; }
-	float get_gauge() const { return gauge; }
-
-	void add(ObjectType &);
-	const ObjectType &get(const ArticleNumber &) const;
-	const ObjectMap &get_all() const { return objects; }
-
-	template<typename T>
-	const T &get(const ArticleNumber &an) const
-	{ return dynamic_cast<const T &>(get(an)); }
+	void add_source(const Msp::FS::Path &);
+	const std::list<Msp::DataFile::CollectionSource *> &get_sources() const { return sources; }
 
+	float get_scale() const { return scale; }
 	Layout &get_layout() { return layout; }
 };