Make use of the geometry part of libmspmath

[r2c2.git] / source / libr2c2 / catalogue.cpp

diff --git a/source/libr2c2/catalogue.cpp b/source/libr2c2/catalogue.cpp
index d86fac071383852f5f241784b9240226e9b5af51..9310c4c91ea567e60d89b151668aec11b1cdcc13 100644 (file)
--- 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,6 +52,17 @@ 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::ObjectLoader<Catalogue>(c)
@@ -60,6 +72,7 @@ Catalogue::Loader::Loader(Catalogue &c):
        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);
@@ -76,8 +89,8 @@ 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), 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()
@@ -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));