Move gauge to TrackAppearance

[r2c2.git] / source / libr2c2 / catalogue.cpp

diff --git a/source/libr2c2/catalogue.cpp b/source/libr2c2/catalogue.cpp
index 70a39859721ad607af1a972b9c4dff294d13e9bc..572423a7f4048279d67b3b2027dc6979e384cc73 100644 (file)
--- 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,86 +14,37 @@ namespace R2C2 {
 
 Catalogue::Catalogue():
        scale(1),
-       gauge(1.524),
        layout(*this)
 { }
 
 Catalogue::~Catalogue()
 {
-       for(TrackMap::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+       for(ObjectMap::iterator i=objects.begin(); i!=objects.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)
+void Catalogue::add(ObjectType &object)
 {
-       if(vehicles.count(veh.get_article_number()))
-               throw Exception("Duplicate vehicle type");
-
-       vehicles[veh.get_article_number()] = &veh;
-       signal_vehicle_added.emit(veh);
+       insert_unique(objects, object.get_article_number(), &object);
+       signal_object_added.emit(object);
 }
 
-const VehicleType &Catalogue::get_vehicle(const ArticleNumber &art_nr) const
+const ObjectType &Catalogue::get(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;
+       return *get_item(objects, art_nr);
 }
 
 
 Catalogue::Loader::Loader(Catalogue &c):
-       DataFile::BasicLoader<Catalogue>(c)
+       DataFile::ObjectLoader<Catalogue>(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(Vector(0.1*obj.gauge, 0), false);
-       obj.path_profile.append_vertex(Vector(-0.1*obj.gauge, 0), false);
+       add("signal", &Loader::signal);
+       add("terrain", &Loader::terrain);
+       add("track", &Loader::track);
+       add("track_appearance", &Loader::track_appearance);
+       add("vehicle", &Loader::vehicle);
 }
 
 void Catalogue::Loader::layout()
@@ -105,44 +52,54 @@ void Catalogue::Loader::layout()
        load_sub(obj.layout);
 }
 
-void Catalogue::Loader::rail_profile()
+void Catalogue::Loader::scale(float n, float d)
 {
-       load_sub(obj.rail_profile);
+       obj.scale = n/d;
 }
 
-void Catalogue::Loader::scale(float n, float d)
+void Catalogue::Loader::signal(ArticleNumber art_nr)
 {
-       obj.scale = n/d;
+       if(obj.objects.count(art_nr))
+               throw key_error(art_nr);
+
+       RefPtr<SignalType> sig = new SignalType(art_nr);
+       load_sub(*sig);
+       obj.add(*sig.release());
 }
 
-void Catalogue::Loader::track(unsigned art_nr)
+void Catalogue::Loader::terrain(ArticleNumber art_nr)
 {
-       track(ArticleNumber(art_nr));
+       if(obj.objects.count(art_nr))
+               throw key_error(art_nr);
+
+       RefPtr<TerrainType> ter = new TerrainType(art_nr);
+       load_sub(*ter);
+       obj.add(*ter.release());
 }
 
 void Catalogue::Loader::track(ArticleNumber art_nr)
 {
-       if(obj.tracks.count(art_nr))
-               throw KeyError("Duplicate track type", art_nr.str());
+       if(obj.objects.count(art_nr))
+               throw key_error(art_nr);
 
-       RefPtr<TrackType> trk = new TrackType(art_nr);
+       RefPtr<TrackType> trk = new TrackType(art_nr, obj.appearance);
        load_sub(*trk);
-       obj.add_track(*trk.release());
+       obj.add(*trk.release());
 }
 
-void Catalogue::Loader::vehicle(unsigned art_nr)
+void Catalogue::Loader::track_appearance()
 {
-       vehicle(ArticleNumber(art_nr));
+       load_sub(obj.appearance);
 }
 
 void Catalogue::Loader::vehicle(ArticleNumber art_nr)
 {
-       if(obj.vehicles.count(art_nr))
-               throw KeyError("Duplicate vehicle type", art_nr.str());
+       if(obj.objects.count(art_nr))
+               throw key_error(art_nr);
 
        RefPtr<VehicleType> veh = new VehicleType(art_nr);
        load_sub(*veh);
-       obj.add_vehicle(*veh.release());
+       obj.add(*veh.release());
 }
 
 } // namespace R2C2