#include <msp/datafile/parser.h>
#include "catalogue.h"
#include "signaltype.h"
+#include "terraintype.h"
#include "tracktype.h"
#include "vehicletype.h"
Catalogue::~Catalogue()
{
- for(TrackMap::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+ for(ObjectMap::iterator i=objects.begin(); i!=objects.end(); ++i)
delete i->second;
- 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)
-{
- 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);
}
Catalogue::Loader::Loader(Catalogue &c):
DataFile::ObjectLoader<Catalogue>(c)
{
- add("ballast_profile", &Loader::ballast_profile);
add("gauge", &Loader::gauge);
add("layout", &Loader::layout);
- add("rail_profile", &Loader::rail_profile);
add("scale", &Loader::scale);
add("signal", &Loader::signal);
- add("track", static_cast<void (Loader::*)(unsigned)>(&Loader::track));
- add("track", static_cast<void (Loader::*)(ArticleNumber)>(&Loader::track));
- add("track_technique", &Catalogue::track_technique);
- add("vehicle", static_cast<void (Loader::*)(unsigned)>(&Loader::vehicle));
- add("vehicle", static_cast<void (Loader::*)(ArticleNumber)>(&Loader::vehicle));
-}
-
-void Catalogue::Loader::ballast_profile()
-{
- load_sub(obj.ballast_profile);
+ add("terrain", &Loader::terrain);
+ add("track", &Loader::track);
+ add("track_appearance", &Loader::track_appearance);
+ add("vehicle", &Loader::vehicle);
}
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()
load_sub(obj.layout);
}
-void Catalogue::Loader::rail_profile()
-{
- load_sub(obj.rail_profile);
-}
-
void Catalogue::Loader::scale(float n, float d)
{
obj.scale = n/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(unsigned art_nr)
+void Catalogue::Loader::terrain(ArticleNumber art_nr)
{
- track(ArticleNumber(art_nr));
+ if(obj.objects.count(art_nr))
+ throw key_error(art_nr);
+
+ RefPtr<TerrainType> ter = new TerrainType(art_nr);
+ load_sub(*ter);
+ obj.add(*ter.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);
+ RefPtr<TrackType> trk = new TrackType(art_nr, obj.appearance);
load_sub(*trk);
- obj.add_track(*trk.release());
+ obj.add(*trk.release());
}
-void Catalogue::Loader::vehicle(unsigned art_nr)
+void Catalogue::Loader::track_appearance()
{
- vehicle(ArticleNumber(art_nr));
+ load_sub(obj.appearance);
}
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