X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Fcatalogue.cpp;h=286407cc09326818973d5a7c18593ac81108efb9;hb=3133b97af17c8a11fb3364453b53d970790a1426;hp=cce5ef04ee564d3b2bd7f8b78278e89a0ccab3ff;hpb=c0c5a34d1056eabdebd350da3534e24c902c0dac;p=r2c2.git

diff --git a/source/libmarklin/catalogue.cpp b/source/libmarklin/catalogue.cpp
index cce5ef0..286407c 100644
--- a/source/libmarklin/catalogue.cpp
+++ b/source/libmarklin/catalogue.cpp
@@ -26,11 +26,20 @@ 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)
+	for(map<unsigned, VehicleType *>::iterator i=vehicles.begin(); i!=vehicles.end(); ++i)
 		delete i->second;
 }
 
-TrackType &Catalogue::get_track(unsigned art_nr) const
+void Catalogue::add_track(TrackType &track)
+{
+	if(tracks.count(track.get_article_number()))
+		throw Exception("Duplicate track type");
+
+	tracks[track.get_article_number()] = &track;
+	signal_track_added.emit(track);
+}
+
+const TrackType &Catalogue::get_track(unsigned art_nr) const
 {
 	map<unsigned, TrackType *>::const_iterator i=tracks.find(art_nr);
 	if(i==tracks.end())
@@ -39,15 +48,33 @@ TrackType &Catalogue::get_track(unsigned art_nr) const
 	return *i->second;
 }
 
-LocoType &Catalogue::get_locomotive(unsigned art_nr) const
+void Catalogue::add_vehicle(VehicleType &veh)
+{
+	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, LocoType *>::const_iterator i=locos.find(art_nr);
-	if(i==locos.end())
-		throw KeyError("Unknown locomotive type");
+	map<unsigned, VehicleType *>::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)
@@ -59,6 +86,7 @@ Catalogue::Loader::Loader(Catalogue &c):
 	add("rail_profile", &Loader::rail_profile);
 	add("scale", &Loader::scale);
 	add("track", &Loader::track);
+	add("vehicle", &Loader::vehicle);
 }
 
 void Catalogue::Loader::ballast_profile()
@@ -69,6 +97,9 @@ void Catalogue::Loader::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()
@@ -78,12 +109,10 @@ void Catalogue::Loader::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();
+	obj.add_vehicle(*loco);
+	loco.release();
 }
 
 void Catalogue::Loader::rail_profile()
@@ -98,12 +127,18 @@ void Catalogue::Loader::scale(float n, float d)
 
 void Catalogue::Loader::track(unsigned art_nr)
 {
-	if(obj.tracks.count(art_nr))
-		throw Exception("Duplicate track number");
-
 	RefPtr<TrackType> trk = new TrackType(art_nr);
 	load_sub(*trk);
-	obj.tracks[art_nr] = trk.release();
+	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