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 3c8e279bcf354a957f05a418c2592538b3f97f67..cce5ef04ee564d3b2bd7f8b78278e89a0ccab3ff 100644 (file)
--- a/source/libmarklin/catalogue.cpp
+++ b/source/libmarklin/catalogue.cpp
@@ -1,63 +1,109 @@
-#include <fstream>
-#include <msp/parser/parser.h>
+/* $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"
-#include "track.h"
+#include "locotype.h"
+#include "tracktype.h"
 
 using namespace std;
 using namespace Msp;
 
 namespace Marklin {
 
-Track *Catalogue::get_track(unsigned art_nr)
-{
-       TrackMap::const_iterator i=tracks.find(art_nr);
-
-       if(i!=tracks.end())
-               return i->second;
+Catalogue::Catalogue():
+       scale(1),
+       gauge(1.524),
+       layout(*this)
+{ }
 
-       return 0;
+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;
 }
 
-void Catalogue::load(const string &fn)
+TrackType &Catalogue::get_track(unsigned art_nr) const
 {
-       ifstream in(fn.c_str());
-       if(!in)
-               throw Exception("File not found");
+       map<unsigned, TrackType *>::const_iterator i=tracks.find(art_nr);
+       if(i==tracks.end())
+               throw KeyError("Unknown track type");
 
-       Parser::Parser parser(in, fn);
-       Loader loader(*this);
-       loader.load(parser);
+       return *i->second;
 }
 
-Catalogue::~Catalogue()
+LocoType &Catalogue::get_locomotive(unsigned art_nr) const
 {
-       for(TrackMap::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-               delete i->second;
+       map<unsigned, LocoType *>::const_iterator i=locos.find(art_nr);
+       if(i==locos.end())
+               throw KeyError("Unknown locomotive type");
+
+       return *i->second;
 }
 
+
 Catalogue::Loader::Loader(Catalogue &c):
-       cat(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::track(unsigned art_no)
+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);
+       load_sub(*loco);
+       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)
 {
-       TrackMap::iterator i=cat.tracks.find(art_no);
-       if(i!=cat.tracks.end())
+       if(obj.tracks.count(art_nr))
                throw Exception("Duplicate track number");
 
-       Track *trk=new Track(art_no);
-       try
-       {
-               load_sub(*trk);
-       }
-       catch(const Msp::Exception &)
-       {
-               delete trk;
-               throw;
-       }
-       cat.tracks.insert(TrackMap::value_type(trk->get_article_number(), trk));
+       RefPtr<TrackType> trk = new TrackType(art_nr);
+       load_sub(*trk);
+       obj.tracks[art_nr] = trk.release();
 }
 
 } // namespace Marklin