X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Fcatalogue.cpp;h=97a91e23ad2af63081f85b0aa7c62324e196fa29;hb=9b536a7197c424c3fa3809063c56da324b56dab2;hp=286407cc09326818973d5a7c18593ac81108efb9;hpb=6968273080fa2a1cbcfc506610d5f249299611e9;p=r2c2.git

diff --git a/source/libmarklin/catalogue.cpp b/source/libmarklin/catalogue.cpp
index 286407c..97a91e2 100644
--- a/source/libmarklin/catalogue.cpp
+++ b/source/libmarklin/catalogue.cpp
@@ -8,8 +8,8 @@ Distributed under the GPL
 #include <msp/core/refptr.h>
 #include <msp/datafile/parser.h>
 #include "catalogue.h"
-#include "locotype.h"
 #include "tracktype.h"
+#include "vehicletype.h"
 
 using namespace std;
 using namespace Msp;
@@ -24,12 +24,17 @@ Catalogue::Catalogue():
 
 Catalogue::~Catalogue()
 {
-	for(map<unsigned, TrackType *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+	for(TrackMap::iterator i=tracks.begin(); i!=tracks.end(); ++i)
 		delete i->second;
-	for(map<unsigned, VehicleType *>::iterator i=vehicles.begin(); i!=vehicles.end(); ++i)
+	for(VehicleMap::iterator i=vehicles.begin(); i!=vehicles.end(); ++i)
 		delete i->second;
 }
 
+float Catalogue::get_rail_elevation() const
+{
+	return ballast_profile.get_height()+rail_profile.get_height();
+}
+
 void Catalogue::add_track(TrackType &track)
 {
 	if(tracks.count(track.get_article_number()))
@@ -39,9 +44,9 @@ void Catalogue::add_track(TrackType &track)
 	signal_track_added.emit(track);
 }
 
-const TrackType &Catalogue::get_track(unsigned art_nr) const
+const TrackType &Catalogue::get_track(const ArticleNumber &art_nr) const
 {
-	map<unsigned, TrackType *>::const_iterator i=tracks.find(art_nr);
+	TrackMap::const_iterator i=tracks.find(art_nr);
 	if(i==tracks.end())
 		throw KeyError("Unknown track type");
 
@@ -57,24 +62,15 @@ void Catalogue::add_vehicle(VehicleType &veh)
 	signal_vehicle_added.emit(veh);
 }
 
-const VehicleType &Catalogue::get_vehicle(unsigned art_nr) const
+const VehicleType &Catalogue::get_vehicle(const ArticleNumber &art_nr) const
 {
-	map<unsigned, VehicleType *>::const_iterator i = vehicles.find(art_nr);
+	VehicleMap::const_iterator i = vehicles.find(art_nr);
 	if(i==vehicles.end())
 		throw KeyError("Unknown vehicle type");
 
 	return *i->second;
 }
 
-const LocoType &Catalogue::get_locomotive(unsigned art_nr) const
-{
-	const VehicleType &veh = get_vehicle(art_nr);
-	if(const LocoType *loco = dynamic_cast<const LocoType *>(&veh))
-		return *loco;
-	
-	throw Exception("Vehicle is not a locomotive");
-}
-
 
 Catalogue::Loader::Loader(Catalogue &c):
 	DataFile::BasicLoader<Catalogue>(c)
@@ -82,11 +78,12 @@ Catalogue::Loader::Loader(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);
-	add("vehicle", &Loader::vehicle);
+	add("track", static_cast<void (Loader::*)(unsigned)>(&Loader::track));
+	add("track", static_cast<void (Loader::*)(ArticleNumber)>(&Loader::track));
+	add("vehicle", static_cast<void (Loader::*)(unsigned)>(&Loader::vehicle));
+	add("vehicle", static_cast<void (Loader::*)(ArticleNumber)>(&Loader::vehicle));
 }
 
 void Catalogue::Loader::ballast_profile()
@@ -107,14 +104,6 @@ void Catalogue::Loader::layout()
 	load_sub(obj.layout);
 }
 
-void Catalogue::Loader::locomotive(unsigned art_nr)
-{
-	RefPtr<LocoType> loco = new LocoType(art_nr);
-	load_sub(*loco);
-	obj.add_vehicle(*loco);
-	loco.release();
-}
-
 void Catalogue::Loader::rail_profile()
 {
 	load_sub(obj.rail_profile);
@@ -126,6 +115,11 @@ void Catalogue::Loader::scale(float n, float d)
 }
 
 void Catalogue::Loader::track(unsigned art_nr)
+{
+	track(ArticleNumber(art_nr));
+}
+
+void Catalogue::Loader::track(ArticleNumber art_nr)
 {
 	RefPtr<TrackType> trk = new TrackType(art_nr);
 	load_sub(*trk);
@@ -134,6 +128,11 @@ void Catalogue::Loader::track(unsigned art_nr)
 }
 
 void Catalogue::Loader::vehicle(unsigned art_nr)
+{
+	vehicle(ArticleNumber(art_nr));
+}
+
+void Catalogue::Loader::vehicle(ArticleNumber art_nr)
 {
 	RefPtr<VehicleType> veh = new VehicleType(art_nr);
 	load_sub(*veh);