X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Fcatalogue.cpp;h=82dde18fdf9ccf76512576dc5157517f480ffd79;hb=3fce1269879f4b4d676f249f91efd69286a606fd;hp=fca6045fc38da36c5613758fd205f95c1a5f791a;hpb=378f04522aa762729c0d5651fb60ad7e4d8ba9f3;p=r2c2.git

diff --git a/source/libmarklin/catalogue.cpp b/source/libmarklin/catalogue.cpp
index fca6045..82dde18 100644
--- a/source/libmarklin/catalogue.cpp
+++ b/source/libmarklin/catalogue.cpp
@@ -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,9 +62,9 @@ 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");
 
@@ -75,8 +80,10 @@ Catalogue::Loader::Loader(Catalogue &c):
 	add("layout", &Loader::layout);
 	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()
@@ -109,18 +116,32 @@ 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)
+{
+	if(obj.tracks.count(art_nr))
+		throw KeyError("Duplicate track type", art_nr.str());
+
 	RefPtr<TrackType> trk = new TrackType(art_nr);
 	load_sub(*trk);
-	obj.add_track(*trk);
-	trk.release();
+	obj.add_track(*trk.release());
 }
 
 void Catalogue::Loader::vehicle(unsigned art_nr)
 {
+	vehicle(ArticleNumber(art_nr));
+}
+
+void Catalogue::Loader::vehicle(ArticleNumber art_nr)
+{
+	if(obj.vehicles.count(art_nr))
+		throw KeyError("Duplicate vehicle type", art_nr.str());
+
 	RefPtr<VehicleType> veh = new VehicleType(art_nr);
 	load_sub(*veh);
-	obj.add_vehicle(*veh);
-	veh.release();
+	obj.add_vehicle(*veh.release());
 }
 
 } // namespace Marklin