Rework article numbers

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

diff --git a/source/libr2c2/catalogue.cpp b/source/libr2c2/catalogue.cpp
index 779e210b1375ad1e4bb09055e7251a33f9194fa2..a919cb76a64d7ff34a8c780d96122c1140597910 100644 (file)
--- a/source/libr2c2/catalogue.cpp
+++ b/source/libr2c2/catalogue.cpp
@@ -14,111 +14,32 @@ 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>().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::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;
-}
-
-void Catalogue::Loader::signal(ArticleNumber art_nr)
-{
-       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::terrain(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.objects.count(art_nr))
-               throw key_error(art_nr);
-
-       RefPtr<TrackType> trk = new TrackType(art_nr);
-       load_sub(*trk);
-       obj.add(*trk.release());
-}
-
-void Catalogue::Loader::vehicle(ArticleNumber art_nr)
-{
-       if(obj.objects.count(art_nr))
-               throw key_error(art_nr);
-
-       RefPtr<VehicleType> veh = new VehicleType(art_nr);
-       load_sub(*veh);
-       obj.add(*veh.release());
+       cat.scale = n/d;
 }
 
 } // namespace R2C2