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()))
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");
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");
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()
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