#include <msp/core/refptr.h>
#include <msp/datafile/parser.h>
#include "catalogue.h"
+#include "signaltype.h"
#include "tracktype.h"
#include "vehicletype.h"
{
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)
delete i->second;
}
return *get_item(vehicles, art_nr);
}
+void Catalogue::add_signal(SignalType &sig)
+{
+ insert_unique(signals, sig.get_article_number(), &sig);
+ signal_signal_added.emit(sig);
+}
+
+const SignalType &Catalogue::get_signal(const ArticleNumber &art_nr) const
+{
+ return *get_item(signals, art_nr);
+}
+
Catalogue::Loader::Loader(Catalogue &c):
- DataFile::BasicLoader<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("track", static_cast<void (Loader::*)(unsigned)>(&Loader::track));
- add("track", static_cast<void (Loader::*)(ArticleNumber)>(&Loader::track));
+ add("signal", &Loader::signal);
+ add("track", &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));
+ add("vehicle", &Loader::vehicle);
}
void Catalogue::Loader::ballast_profile()
{
obj.gauge = g/1000;
obj.path_profile = Profile();
- obj.path_profile.append_vertex(Vector(0.1*obj.gauge, 0), false);
- obj.path_profile.append_vertex(Vector(-0.1*obj.gauge, 0), false);
+ 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()
obj.scale = n/d;
}
-void Catalogue::Loader::track(unsigned art_nr)
+void Catalogue::Loader::signal(ArticleNumber art_nr)
{
- track(ArticleNumber(art_nr));
+ if(obj.signals.count(art_nr))
+ throw key_error(art_nr);
+
+ RefPtr<SignalType> sig = new SignalType(art_nr);
+ load_sub(*sig);
+ obj.add_signal(*sig.release());
}
void Catalogue::Loader::track(ArticleNumber art_nr)
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))