X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fsignaltype.cpp;h=0ec53cd89e18ddc346d426998cd24dad7e4bf5a2;hb=b860a56bd9bc8894311c02d7673f379beff3220b;hp=9fb25e90e0808ac6304e1727c71f9bea01c9c3ec;hpb=3e3675f8d86b06cdea7df197dfe8866ffb285aec;p=r2c2.git

diff --git a/source/libr2c2/signaltype.cpp b/source/libr2c2/signaltype.cpp
index 9fb25e9..0ec53cd 100644
--- a/source/libr2c2/signaltype.cpp
+++ b/source/libr2c2/signaltype.cpp
@@ -1,19 +1,24 @@
+#include <msp/geometry/circle.h>
+#include <msp/geometry/extrudedshape.h>
+#include <msp/geometry/transformedshape.h>
 #include "signaltype.h"
 
 using namespace std;
+using namespace Msp;
 
 namespace R2C2 {
 
-SignalType::SignalType(const ArticleNumber &an):
-	art_nr(an)
+SignalType::SignalType()
 {
+	shape = new Geometry::TransformedShape<float, 3>(
+		Geometry::ExtrudedShape<float, 3>(Geometry::Circle<float>(0.01), 0.12),
+		Transform::translation(Vector(0, -0.035, 0.06)));
 }
 
 
 SignalType::Loader::Loader(SignalType &st):
-	ObjectLoader<SignalType>(st)
+	DataFile::DerivedObjectLoader<SignalType, ObjectType::Loader>(st)
 {
-	add("description", &SignalType::description);
 	add("indication",  &Loader::indication);
 	add("object",      &SignalType::object);
 }