X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Flibr2c2%2Fcatalogue.cpp;h=3fb314a404a5d2f19b4c3833dd26eca4946d1b81;hb=dec294d40194a640e7b4bccf20dd1baa4a87038c;hp=847045634a1927ea142020a1a54c9a2d43360d72;hpb=4236c30c0a7a48854e9634e9ad7d8d6e0fd243a3;p=r2c2.git

diff --git a/source/libr2c2/catalogue.cpp b/source/libr2c2/catalogue.cpp
index 8470456..3fb314a 100644
--- a/source/libr2c2/catalogue.cpp
+++ b/source/libr2c2/catalogue.cpp
@@ -2,6 +2,7 @@
 #include <msp/core/refptr.h>
 #include <msp/datafile/parser.h>
 #include "catalogue.h"
+#include "signaltype.h"
 #include "tracktype.h"
 #include "vehicletype.h"
 
@@ -51,15 +52,27 @@ const VehicleType &Catalogue::get_vehicle(const ArticleNumber &art_nr) const
 	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("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);
@@ -95,6 +108,16 @@ 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))
+		throw key_error(art_nr);
+
+	RefPtr<SignalType> sig = new SignalType(art_nr);
+	load_sub(*sig);
+	obj.add_signal(*sig.release());
+}
+
 void Catalogue::Loader::track(unsigned art_nr)
 {
 	track(ArticleNumber(art_nr));