X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fcatalogue.cpp;h=a919cb76a64d7ff34a8c780d96122c1140597910;hb=b860a56bd9bc8894311c02d7673f379beff3220b;hp=51cad9a031a134ddc4107e7413f2d0b5da4b7a02;hpb=c5f5ec54e81a6a85f911fa1075a0939a7352fbfd;p=r2c2.git

diff --git a/source/libr2c2/catalogue.cpp b/source/libr2c2/catalogue.cpp
index 51cad9a..a919cb7 100644
--- a/source/libr2c2/catalogue.cpp
+++ b/source/libr2c2/catalogue.cpp
@@ -1,13 +1,9 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2006-2010  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
+#include <msp/core/maputils.h>
 #include <msp/core/refptr.h>
 #include <msp/datafile/parser.h>
 #include "catalogue.h"
+#include "signaltype.h"
+#include "terraintype.h"
 #include "tracktype.h"
 #include "vehicletype.h"
 
@@ -18,131 +14,32 @@ 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(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)
-{
-	if(tracks.count(track.get_article_number()))
-		throw Exception("Duplicate track type");
-
-	tracks[track.get_article_number()] = &track;
-	signal_track_added.emit(track);
-}
-
-const TrackType &Catalogue::get_track(const ArticleNumber &art_nr) const
-{
-	TrackMap::const_iterator i=tracks.find(art_nr);
-	if(i==tracks.end())
-		throw KeyError("Unknown track type");
-
-	return *i->second;
-}
-
-void Catalogue::add_vehicle(VehicleType &veh)
-{
-	if(vehicles.count(veh.get_article_number()))
-		throw Exception("Duplicate vehicle type");
-
-	vehicles[veh.get_article_number()] = &veh;
-	signal_vehicle_added.emit(veh);
-}
-
-const VehicleType &Catalogue::get_vehicle(const ArticleNumber &art_nr) const
-{
-	VehicleMap::const_iterator i = vehicles.find(art_nr);
-	if(i==vehicles.end())
-		throw KeyError("Unknown vehicle type");
-
-	return *i->second;
+	add_type<TrackType>().keyword("track");
+	add_type<SignalType>().keyword("signal");
+	add_type<VehicleType>().keyword("vehicle");
+	add_type<TerrainType>().keyword("terrain");
+	add_type<TrackAppearance>().keyword("track_appearance");
 }
 
 
 Catalogue::Loader::Loader(Catalogue &c):
-	DataFile::BasicLoader<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("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(Point(0.1*obj.gauge, 0), false);
-	obj.path_profile.append_vertex(Point(-0.1*obj.gauge, 0), false);
 }
 
 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;
-}
-
-void Catalogue::Loader::track(unsigned art_nr)
-{
-	track(ArticleNumber(art_nr));
-}
-
-void Catalogue::Loader::track(ArticleNumber art_nr)
-{
-	if(obj.tracks.count(art_nr))
-		throw KeyError("Duplicate track type", art_nr.str());
-
-	RefPtr<TrackType> trk = new TrackType(art_nr);
-	load_sub(*trk);
-	obj.add_track(*trk.release());
-}
-
-void Catalogue::Loader::vehicle(unsigned art_nr)
-{
-	vehicle(ArticleNumber(art_nr));
-}
-
-void Catalogue::Loader::vehicle(ArticleNumber art_nr)
-{
-	if(obj.vehicles.count(art_nr))
-		throw KeyError("Duplicate vehicle type", art_nr.str());
-
-	RefPtr<VehicleType> veh = new VehicleType(art_nr);
-	load_sub(*veh);
-	obj.add_vehicle(*veh.release());
+	cat.scale = n/d;
 }
 
 } // namespace R2C2