X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fcatalogue.cpp;h=2afe4eaa14885cee663de30af2475648e9486ab4;hb=11c68656ac53318801dcb36078509a07ae2c2a94;hp=221a6f0663667cca1665e4388d867e422c16fb5e;hpb=7c98e23312cf01ce1fa6c1ffd8e36c22d2fa6110;p=r2c2.git

diff --git a/source/libr2c2/catalogue.cpp b/source/libr2c2/catalogue.cpp
index 221a6f0..2afe4ea 100644
--- a/source/libr2c2/catalogue.cpp
+++ b/source/libr2c2/catalogue.cpp
@@ -3,6 +3,7 @@
 #include <msp/datafile/parser.h>
 #include "catalogue.h"
 #include "signaltype.h"
+#include "terraintype.h"
 #include "tracktype.h"
 #include "vehicletype.h"
 
@@ -13,100 +14,68 @@ namespace R2C2 {
 
 Catalogue::Catalogue():
 	scale(1),
-	gauge(1.524),
 	layout(*this)
-{ }
-
-Catalogue::~Catalogue()
-{
-	for(ObjectMap::iterator i=objects.begin(); i!=objects.end(); ++i)
-		delete i->second;
-}
-
-float Catalogue::get_rail_elevation() const
-{
-	return ballast_profile.get_height()+rail_profile.get_height();
-}
-
-void Catalogue::add(ObjectType &object)
-{
-	insert_unique(objects, object.get_article_number(), &object);
-	signal_object_added.emit(object);
-}
-
-const ObjectType &Catalogue::get(const ArticleNumber &art_nr) const
 {
-	return *get_item(objects, art_nr);
+	add_type<TrackType>();
+	add_type<SignalType>();
+	add_type<VehicleType>();
+	add_type<TerrainType>();
+	add_type<TrackAppearance>().keyword("track_appearance");
 }
 
 
 Catalogue::Loader::Loader(Catalogue &c):
-	DataFile::ObjectLoader<Catalogue>(c)
+	Collection::Loader(c),
+	cat(c)
 {
-	add("ballast_profile", &Loader::ballast_profile);
-	add("gauge", &Loader::gauge);
 	add("layout", &Loader::layout);
-	add("rail_profile", &Loader::rail_profile);
 	add("scale", &Loader::scale);
 	add("signal", &Loader::signal);
+	add("terrain", &Loader::terrain);
 	add("track", &Loader::track);
-	add("track_technique", &Catalogue::track_technique);
 	add("vehicle", &Loader::vehicle);
 }
 
-void Catalogue::Loader::ballast_profile()
-{
-	load_sub(obj.ballast_profile);
-}
-
-void Catalogue::Loader::gauge(float g)
-{
-	obj.gauge = g/1000;
-}
-
 void Catalogue::Loader::layout()
 {
-	load_sub(obj.layout);
-}
-
-void Catalogue::Loader::rail_profile()
-{
-	load_sub(obj.rail_profile);
+	load_sub(cat.layout);
 }
 
 void Catalogue::Loader::scale(float n, float d)
 {
-	obj.scale = n/d;
+	cat.scale = n/d;
 }
 
-void Catalogue::Loader::signal(ArticleNumber art_nr)
+void Catalogue::Loader::signal(const string &n)
 {
-	if(obj.objects.count(art_nr))
-		throw key_error(art_nr);
-
-	RefPtr<SignalType> sig = new SignalType(art_nr);
+	RefPtr<SignalType> sig = new SignalType(n);
 	load_sub(*sig);
-	obj.add(*sig.release());
+	cat.add(n, sig.get());
+	sig.release();
 }
 
-void Catalogue::Loader::track(ArticleNumber art_nr)
+void Catalogue::Loader::terrain(const string &n)
 {
-	if(obj.objects.count(art_nr))
-		throw key_error(art_nr);
-
-	RefPtr<TrackType> trk = new TrackType(art_nr);
-	load_sub(*trk);
-	obj.add(*trk.release());
+	RefPtr<TerrainType> ter = new TerrainType(n);
+	load_sub(*ter);
+	cat.add(n, ter.get());
+	ter.release();
 }
 
-void Catalogue::Loader::vehicle(ArticleNumber art_nr)
+void Catalogue::Loader::track(const string &n)
 {
-	if(obj.objects.count(art_nr))
-		throw key_error(art_nr);
+	RefPtr<TrackType> trk = new TrackType(n);
+	load_sub(*trk, cat);
+	cat.add(n, trk.get());
+	trk.release();
+}
 
-	RefPtr<VehicleType> veh = new VehicleType(art_nr);
+void Catalogue::Loader::vehicle(const string &n)
+{
+	RefPtr<VehicleType> veh = new VehicleType(n);
 	load_sub(*veh);
-	obj.add(*veh.release());
+	cat.add(n, veh.get());
+	veh.release();
 }
 
 } // namespace R2C2