X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Fcatalogue.cpp;h=beab69a62ae387cf37b54745518472ac14ee0ef9;hb=29b131b59ba562f996a338a453745e5a4dfad5b7;hp=3c8e279bcf354a957f05a418c2592538b3f97f67;hpb=6c61179fe09af2f5366d50f10aadbf5f83438087;p=r2c2.git

diff --git a/source/libmarklin/catalogue.cpp b/source/libmarklin/catalogue.cpp
index 3c8e279..beab69a 100644
--- a/source/libmarklin/catalogue.cpp
+++ b/source/libmarklin/catalogue.cpp
@@ -1,63 +1,131 @@
-#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 "tracktype.h"
+#include "vehicletype.h"
 
 using namespace std;
 using namespace Msp;
 
 namespace Marklin {
 
-Track *Catalogue::get_track(unsigned art_nr)
+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, VehicleType *>::iterator i=vehicles.begin(); i!=vehicles.end(); ++i)
+		delete i->second;
+}
+
+float Catalogue::get_rail_elevation() const
 {
-	TrackMap::const_iterator i=tracks.find(art_nr);
+	return ballast_profile.get_height()+rail_profile.get_height();
+}
 
-	if(i!=tracks.end())
-		return i->second;
+void Catalogue::add_track(TrackType &track)
+{
+	if(tracks.count(track.get_article_number()))
+		throw Exception("Duplicate track type");
 
-	return 0;
+	tracks[track.get_article_number()] = &track;
+	signal_track_added.emit(track);
 }
 
-void Catalogue::load(const string &fn)
+const 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()
+void Catalogue::add_vehicle(VehicleType &veh)
 {
-	for(TrackMap::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-		delete i->second;
+	if(vehicles.count(veh.get_article_number()))
+		throw Exception("Duplicate vehicle type");
+
+	vehicles[veh.get_article_number()] = &veh;
+	signal_vehicle_added.emit(veh);
+}
+
+const VehicleType &Catalogue::get_vehicle(unsigned art_nr) const
+{
+	map<unsigned, VehicleType *>::const_iterator i = vehicles.find(art_nr);
+	if(i==vehicles.end())
+		throw KeyError("Unknown vehicle 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("rail_profile", &Loader::rail_profile);
+	add("scale", &Loader::scale);
 	add("track", &Loader::track);
+	add("vehicle", &Loader::vehicle);
+}
+
+void Catalogue::Loader::ballast_profile()
+{
+	load_sub(obj.ballast_profile);
+}
+
+void Catalogue::Loader::gauge(float g)
+{
+	obj.gauge = g/1000;
+	obj.path_profile = Profile();
+	obj.path_profile.append_point(Point(0.1*obj.gauge, 0));
+	obj.path_profile.append_point(Point(-0.1*obj.gauge, 0));
+}
+
+void Catalogue::Loader::layout()
+{
+	load_sub(obj.layout);
 }
 
-void Catalogue::Loader::track(unsigned art_no)
+void Catalogue::Loader::rail_profile()
 {
-	TrackMap::iterator i=cat.tracks.find(art_no);
-	if(i!=cat.tracks.end())
-		throw Exception("Duplicate track number");
+	load_sub(obj.rail_profile);
+}
+
+void Catalogue::Loader::scale(float n, float d)
+{
+	obj.scale = n/d;
+}
 
-	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));
+void Catalogue::Loader::track(unsigned art_nr)
+{
+	RefPtr<TrackType> trk = new TrackType(art_nr);
+	load_sub(*trk);
+	obj.add_track(*trk);
+	trk.release();
+}
+
+void Catalogue::Loader::vehicle(unsigned art_nr)
+{
+	RefPtr<VehicleType> veh = new VehicleType(art_nr);
+	load_sub(*veh);
+	obj.add_vehicle(*veh);
+	veh.release();
 }
 
 } // namespace Marklin