X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Fcatalogue.cpp;h=3ab96a99ebbadb325f821c1c52e74ba083ee1ac0;hb=447d621e93e71b710fed0920b473350122426b97;hp=00c27738cfb118a06040d626fe90064e036435cd;hpb=52cbe8d99669f843f8f75c51128e2748584dd03a;p=r2c2.git

diff --git a/source/libmarklin/catalogue.cpp b/source/libmarklin/catalogue.cpp
index 00c2773..3ab96a9 100644
--- a/source/libmarklin/catalogue.cpp
+++ b/source/libmarklin/catalogue.cpp
@@ -1,6 +1,7 @@
 #include <msp/core/refptr.h>
 #include <msp/datafile/parser.h>
 #include "catalogue.h"
+#include "locotype.h"
 #include "tracktype.h"
 
 using namespace std;
@@ -14,7 +15,7 @@ Catalogue::~Catalogue()
 		delete i->second;
 }
 
-TrackType &Catalogue::get_track(unsigned art_nr)
+TrackType &Catalogue::get_track(unsigned art_nr) const
 {
 	map<unsigned, TrackType *>::const_iterator i=tracks.find(art_nr);
 	if(i==tracks.end())
@@ -23,6 +24,15 @@ TrackType &Catalogue::get_track(unsigned art_nr)
 	return *i->second;
 }
 
+LocoType &Catalogue::get_locomotive(unsigned art_nr) const
+{
+	map<unsigned, LocoType *>::const_iterator i=locos.find(art_nr);
+	if(i==locos.end())
+		throw KeyError("Unknown locomotive type");
+
+	return *i->second;
+}
+
 void Catalogue::load(const string &fn)
 {
 	IO::File in(fn.c_str());
@@ -36,9 +46,22 @@ void Catalogue::load(const string &fn)
 Catalogue::Loader::Loader(Catalogue &c):
 	cat(c)
 {
+	add("locomotive", &Loader::locomotive);
 	add("track", &Loader::track);
 }
 
+void Catalogue::Loader::locomotive(unsigned art_no)
+{
+	map<unsigned, LocoType *>::iterator i=cat.locos.find(art_no);
+	if(i!=cat.locos.end())
+		throw Exception("Duplicate locomotive number");
+
+	RefPtr<LocoType> loco=new LocoType(art_no);
+	load_sub(*loco);
+	unsigned art_nr=loco->get_article_number();
+	cat.locos[art_nr]=loco.release();
+}
+
 void Catalogue::Loader::track(unsigned art_no)
 {
 	map<unsigned, TrackType *>::iterator i=cat.tracks.find(art_no);
@@ -48,7 +71,7 @@ void Catalogue::Loader::track(unsigned art_no)
 	RefPtr<TrackType> trk=new TrackType(art_no);
 	load_sub(*trk);
 	unsigned art_nr=trk->get_article_number();
-	cat.tracks.insert(map<unsigned, TrackType *>::value_type(art_nr, trk.release()));
+	cat.tracks[art_nr]=trk.release();
 }
 
 } // namespace Marklin