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 3ab96a99ebbadb325f821c1c52e74ba083ee1ac0..cce5ef04ee564d3b2bd7f8b78278e89a0ccab3ff 100644 (file)
--- a/source/libmarklin/catalogue.cpp
+++ b/source/libmarklin/catalogue.cpp
@@ -1,3 +1,10 @@
+/* $Id$
+
+This file is part of the MSP Märklin suite
+Copyright © 2006-2010  Mikkosoft Productions, Mikko Rasa
+Distributed under the GPL
+*/
+
 #include <msp/core/refptr.h>
 #include <msp/datafile/parser.h>
 #include "catalogue.h"
@@ -9,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
@@ -33,45 +48,62 @@ LocoType &Catalogue::get_locomotive(unsigned art_nr) const
        return *i->second;
 }
 
-void Catalogue::load(const string &fn)
+
+Catalogue::Loader::Loader(Catalogue &c):
+       DataFile::BasicLoader<Catalogue>(c)
 {
-       IO::File in(fn.c_str());
+       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);
+}
 
-       DataFile::Parser parser(in, fn);
-       Loader loader(*this);
-       loader.load(parser);
+void Catalogue::Loader::ballast_profile()
+{
+       load_sub(obj.ballast_profile);
 }
 
+void Catalogue::Loader::gauge(float g)
+{
+       obj.gauge = g/1000;
+}
 
-Catalogue::Loader::Loader(Catalogue &c):
-       cat(c)
+void Catalogue::Loader::layout()
 {
-       add("locomotive", &Loader::locomotive);
-       add("track", &Loader::track);
+       load_sub(obj.layout);
 }
 
-void Catalogue::Loader::locomotive(unsigned art_no)
+void Catalogue::Loader::locomotive(unsigned art_nr)
 {
-       map<unsigned, LocoType *>::iterator i=cat.locos.find(art_no);
-       if(i!=cat.locos.end())
+       if(obj.locos.count(art_nr))
                throw Exception("Duplicate locomotive number");
 
-       RefPtr<LocoType> loco=new LocoType(art_no);
+       RefPtr<LocoType> loco = new LocoType(art_nr);
        load_sub(*loco);
-       unsigned art_nr=loco->get_article_number();
-       cat.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_no)
+void Catalogue::Loader::track(unsigned art_nr)
 {
-       map<unsigned, TrackType *>::iterator i=cat.tracks.find(art_no);
-       if(i!=cat.tracks.end())
+       if(obj.tracks.count(art_nr))
                throw Exception("Duplicate track number");
 
-       RefPtr<TrackType> trk=new TrackType(art_no);
+       RefPtr<TrackType> trk = new TrackType(art_nr);
        load_sub(*trk);
-       unsigned art_nr=trk->get_article_number();
-       cat.tracks[art_nr]=trk.release();
+       obj.tracks[art_nr] = trk.release();
 }
 
 } // namespace Marklin