X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fcatalogue.cpp;h=cfd5d6425f29d971bc116d96c72cfe0307eb4468;hb=81ee4fbd16b472892b67b35ea85956423a2247ed;hp=0d62d72a85c6076eabc85cf4c0a4c5708596848c;hpb=0db89b665527609582df98854c9e3255d1017811;p=r2c2.git

diff --git a/source/libr2c2/catalogue.cpp b/source/libr2c2/catalogue.cpp
index 0d62d72..cfd5d64 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,141 +14,73 @@ namespace R2C2 {
 
 Catalogue::Catalogue():
 	scale(1),
-	gauge(1.524),
 	layout(*this)
-{ }
-
-Catalogue::~Catalogue()
-{
-	for(TrackMap::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-		delete i->second;
-	for(SignalMap::iterator i=signals.begin(); i!=signals.end(); ++i)
-		delete i->second;
-	for(VehicleMap::iterator i=vehicles.begin(); i!=vehicles.end(); ++i)
-		delete i->second;
-}
-
-float Catalogue::get_rail_elevation() const
-{
-	return ballast_profile.get_height()+rail_profile.get_height();
-}
-
-void Catalogue::add_track(TrackType &track)
-{
-	insert_unique(tracks, track.get_article_number(), &track);
-	signal_track_added.emit(track);
-}
-
-const TrackType &Catalogue::get_track(const ArticleNumber &art_nr) const
-{
-	return *get_item(tracks, art_nr);
-}
-
-void Catalogue::add_vehicle(VehicleType &veh)
-{
-	insert_unique(vehicles, veh.get_article_number(), &veh);
-	signal_vehicle_added.emit(veh);
-}
-
-const VehicleType &Catalogue::get_vehicle(const ArticleNumber &art_nr) const
-{
-	return *get_item(vehicles, art_nr);
-}
-
-void Catalogue::add_signal(SignalType &sig)
-{
-	insert_unique(signals, sig.get_article_number(), &sig);
-	signal_signal_added.emit(sig);
-}
-
-const SignalType &Catalogue::get_signal(const ArticleNumber &art_nr) const
 {
-	return *get_item(signals, art_nr);
+	add_type<TrackType>();
+	add_type<SignalType>();
+	add_type<VehicleType>();
+	add_type<TerrainType>();
 }
 
 
 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("track", static_cast<void (Loader::*)(unsigned)>(&Loader::track));
-	add("track", static_cast<void (Loader::*)(ArticleNumber)>(&Loader::track));
-	add("track_technique", &Catalogue::track_technique);
-	add("vehicle", static_cast<void (Loader::*)(unsigned)>(&Loader::vehicle));
-	add("vehicle", static_cast<void (Loader::*)(ArticleNumber)>(&Loader::vehicle));
-}
-
-void Catalogue::Loader::ballast_profile()
-{
-	load_sub(obj.ballast_profile);
-}
-
-void Catalogue::Loader::gauge(float g)
-{
-	obj.gauge = g/1000;
-	obj.path_profile = Profile();
-	obj.path_profile.append_vertex(Vector(0.1*obj.gauge, 0, 0), false);
-	obj.path_profile.append_vertex(Vector(-0.1*obj.gauge, 0, 0), false);
+	add("terrain", &Loader::terrain);
+	add("track", &Loader::track);
+	add("track_appearance", &Loader::track_appearance);
+	add("vehicle", &Loader::vehicle);
 }
 
 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.signals.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_signal(*sig.release());
+	cat.add(n, sig.get());
+	sig.release();
 }
 
-void Catalogue::Loader::track(unsigned art_nr)
+void Catalogue::Loader::terrain(const string &n)
 {
-	track(ArticleNumber(art_nr));
+	RefPtr<TerrainType> ter = new TerrainType(n);
+	load_sub(*ter);
+	cat.add(n, ter.get());
+	ter.release();
 }
 
-void Catalogue::Loader::track(ArticleNumber art_nr)
+void Catalogue::Loader::track(const string &n)
 {
-	if(obj.tracks.count(art_nr))
-		throw key_error(art_nr);
-
-	RefPtr<TrackType> trk = new TrackType(art_nr);
+	RefPtr<TrackType> trk = new TrackType(n, &cat.appearance);
 	load_sub(*trk);
-	obj.add_track(*trk.release());
+	cat.add(n, trk.get());
+	trk.release();
 }
 
-void Catalogue::Loader::vehicle(unsigned art_nr)
+void Catalogue::Loader::track_appearance()
 {
-	vehicle(ArticleNumber(art_nr));
+	load_sub(cat.appearance);
 }
 
-void Catalogue::Loader::vehicle(ArticleNumber art_nr)
+void Catalogue::Loader::vehicle(const string &n)
 {
-	if(obj.vehicles.count(art_nr))
-		throw key_error(art_nr);
-
-	RefPtr<VehicleType> veh = new VehicleType(art_nr);
+	RefPtr<VehicleType> veh = new VehicleType(n);
 	load_sub(*veh);
-	obj.add_vehicle(*veh.release());
+	cat.add(n, veh.get());
+	veh.release();
 }
 
 } // namespace R2C2