Fix memory leaks and other bad stuff

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

diff --git a/source/libmarklin/catalogue.cpp b/source/libmarklin/catalogue.cpp
index 8faaa102596a2db071d23bc70135bdf227f29fcd..cce5ef04ee564d3b2bd7f8b78278e89a0ccab3ff 100644 (file)
--- a/source/libmarklin/catalogue.cpp
+++ b/source/libmarklin/catalogue.cpp
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of the MSP Märklin suite
-Copyright © 2006-2009  Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2010  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
@@ -16,10 +16,18 @@ using namespace Msp;
 
 namespace Marklin {
 
+Catalogue::Catalogue():
+       scale(1),
+       gauge(1.524),
+       layout(*this)
+{ }
+
 Catalogue::~Catalogue()
 {
        for(map<unsigned, TrackType *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
                delete i->second;
+       for(map<unsigned, LocoType *>::iterator i=locos.begin(); i!=locos.end(); ++i)
+               delete i->second;
 }
 
 TrackType &Catalogue::get_track(unsigned art_nr) const
@@ -40,31 +48,52 @@ LocoType &Catalogue::get_locomotive(unsigned art_nr) const
        return *i->second;
 }
 
-void Catalogue::load(const string &fn)
-{
-       IO::File in(fn.c_str());
-
-       DataFile::Parser parser(in, fn);
-       Loader loader(*this);
-       loader.load(parser);
-}
-
 
 Catalogue::Loader::Loader(Catalogue &c):
        DataFile::BasicLoader<Catalogue>(c)
 {
+       add("ballast_profile", &Loader::ballast_profile);
+       add("gauge", &Loader::gauge);
+       add("layout", &Loader::layout);
        add("locomotive", &Loader::locomotive);
+       add("rail_profile", &Loader::rail_profile);
+       add("scale", &Loader::scale);
        add("track", &Loader::track);
 }
 
+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::locomotive(unsigned art_nr)
 {
        if(obj.locos.count(art_nr))
                throw Exception("Duplicate locomotive number");
 
-       RefPtr<LocoType> loco=new LocoType(art_nr);
+       RefPtr<LocoType> loco = new LocoType(art_nr);
        load_sub(*loco);
-       obj.locos[art_nr]=loco.release();
+       obj.locos[art_nr] = loco.release();
+}
+
+void Catalogue::Loader::rail_profile()
+{
+       load_sub(obj.rail_profile);
+}
+
+void Catalogue::Loader::scale(float n, float d)
+{
+       obj.scale = n/d;
 }
 
 void Catalogue::Loader::track(unsigned art_nr)
@@ -72,9 +101,9 @@ void Catalogue::Loader::track(unsigned art_nr)
        if(obj.tracks.count(art_nr))
                throw Exception("Duplicate track number");
 
-       RefPtr<TrackType> trk=new TrackType(art_nr);
+       RefPtr<TrackType> trk = new TrackType(art_nr);
        load_sub(*trk);
-       obj.tracks[art_nr]=trk.release();
+       obj.tracks[art_nr] = trk.release();
 }
 
 } // namespace Marklin