X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fcatalogue.cpp;h=221a6f0663667cca1665e4388d867e422c16fb5e;hb=26a8dbeae14c685c6aef1aad3aa75c6f1a75e458;hp=ec3e95a7d00a2ed45c222a2932c9d5c66491d1ab;hpb=e72050508512570d3cb1bcce768b155a71fe05e5;p=r2c2.git

diff --git a/source/libr2c2/catalogue.cpp b/source/libr2c2/catalogue.cpp
index ec3e95a..221a6f0 100644
--- a/source/libr2c2/catalogue.cpp
+++ b/source/libr2c2/catalogue.cpp
@@ -19,11 +19,7 @@ Catalogue::Catalogue():
 
 Catalogue::~Catalogue()
 {
-	for(TrackMap::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-		delete i->second;
-	for(SignalMap::iterator i=signals.begin(); i!=signals.end(); ++i)
-		delete i->second;
-	for(VehicleMap::iterator i=vehicles.begin(); i!=vehicles.end(); ++i)
+	for(ObjectMap::iterator i=objects.begin(); i!=objects.end(); ++i)
 		delete i->second;
 }
 
@@ -32,37 +28,15 @@ float Catalogue::get_rail_elevation() const
 	return ballast_profile.get_height()+rail_profile.get_height();
 }
 
-void Catalogue::add_track(TrackType &track)
-{
-	insert_unique(tracks, track.get_article_number(), &track);
-	signal_track_added.emit(track);
-}
-
-const TrackType &Catalogue::get_track(const ArticleNumber &art_nr) const
-{
-	return *get_item(tracks, art_nr);
-}
-
-void Catalogue::add_vehicle(VehicleType &veh)
-{
-	insert_unique(vehicles, veh.get_article_number(), &veh);
-	signal_vehicle_added.emit(veh);
-}
-
-const VehicleType &Catalogue::get_vehicle(const ArticleNumber &art_nr) const
-{
-	return *get_item(vehicles, art_nr);
-}
-
-void Catalogue::add_signal(SignalType &sig)
+void Catalogue::add(ObjectType &object)
 {
-	insert_unique(signals, sig.get_article_number(), &sig);
-	signal_signal_added.emit(sig);
+	insert_unique(objects, object.get_article_number(), &object);
+	signal_object_added.emit(object);
 }
 
-const SignalType &Catalogue::get_signal(const ArticleNumber &art_nr) const
+const ObjectType &Catalogue::get(const ArticleNumber &art_nr) const
 {
-	return *get_item(signals, art_nr);
+	return *get_item(objects, art_nr);
 }
 
 
@@ -88,9 +62,6 @@ void Catalogue::Loader::ballast_profile()
 void Catalogue::Loader::gauge(float g)
 {
 	obj.gauge = g/1000;
-	obj.path_profile = Profile();
-	obj.path_profile.append_vertex(Vector(0.1*obj.gauge, 0, 0), false);
-	obj.path_profile.append_vertex(Vector(-0.1*obj.gauge, 0, 0), false);
 }
 
 void Catalogue::Loader::layout()
@@ -110,32 +81,32 @@ void Catalogue::Loader::scale(float n, float d)
 
 void Catalogue::Loader::signal(ArticleNumber art_nr)
 {
-	if(obj.signals.count(art_nr))
+	if(obj.objects.count(art_nr))
 		throw key_error(art_nr);
 
 	RefPtr<SignalType> sig = new SignalType(art_nr);
 	load_sub(*sig);
-	obj.add_signal(*sig.release());
+	obj.add(*sig.release());
 }
 
 void Catalogue::Loader::track(ArticleNumber art_nr)
 {
-	if(obj.tracks.count(art_nr))
+	if(obj.objects.count(art_nr))
 		throw key_error(art_nr);
 
 	RefPtr<TrackType> trk = new TrackType(art_nr);
 	load_sub(*trk);
-	obj.add_track(*trk.release());
+	obj.add(*trk.release());
 }
 
 void Catalogue::Loader::vehicle(ArticleNumber art_nr)
 {
-	if(obj.vehicles.count(art_nr))
+	if(obj.objects.count(art_nr))
 		throw key_error(art_nr);
 
 	RefPtr<VehicleType> veh = new VehicleType(art_nr);
 	load_sub(*veh);
-	obj.add_vehicle(*veh.release());
+	obj.add(*veh.release());
 }
 
 } // namespace R2C2