From dff3aa428ff050c2cce501f646977ddad921feca Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Wed, 1 Apr 2015 04:13:16 +0200
Subject: Move 2Geom work to a intermediate positon -helper- Removed dependency
 to helper/geom.h Now use a simple vector, not a vector of pairs of size_t and
 Satellite Getters and setters on Satellite removed Update store parameter to
 a more friendly string, like powerstroke Todo: Documentation and Fix coding
 style.

(bzr r13645.1.63)
---
 src/live_effects/parameter/array.h | 38 +++++++++++++++++---------------------
 1 file changed, 17 insertions(+), 21 deletions(-)

(limited to 'src/live_effects/parameter/array.h')

diff --git a/src/live_effects/parameter/array.h b/src/live_effects/parameter/array.h
index 4fb053dbb..25e479304 100644
--- a/src/live_effects/parameter/array.h
+++ b/src/live_effects/parameter/array.h
@@ -15,8 +15,8 @@
 
 #include "live_effects/parameter/parameter.h"
 
-#include <2geom/satellite.h>
-#include <2geom/satellite-enum.h>
+#include "helper/geom-satellite.h"
+#include "helper/geom-satellite-enum.h"
 #include "svg/svg.h"
 #include "svg/stringstream.h"
 
@@ -111,26 +111,22 @@ protected:
         str << nVector;
     }
 
-    void writesvgData(SVGOStringStream &str, std::pair<size_t, Geom::Satellite> const &nVector) const {
-        str << nVector.first;
+    void writesvgData(SVGOStringStream &str, Geom::Satellite const &nVector) const {
+        str << nVector.getSatelliteTypeGchar();
         str << ",";
-        str << nVector.second.getSatelliteTypeGchar();
-        str << "*";
-        str << nVector.second.getIsTime();
-        str << "*";
-        str << nVector.second.getIsEndOpen();
-        str << "*";
-        str << nVector.second.getActive();
-        str << "*";
-        str << nVector.second.getHasMirror();
-        str << "*";
-        str << nVector.second.getHidden();
-        str << "*";
-        str << nVector.second.getAmount();
-        str << "*";
-        str << nVector.second.getAngle();
-        str << "*";
-        str << nVector.second.getSteps();
+        str << nVector.isTime;
+        str << ",";
+        str << nVector.active;
+        str << ",";
+        str << nVector.hasMirror;
+        str << ",";
+        str << nVector.hidden;
+        str << ",";
+        str << nVector.amount;
+        str << ",";
+        str << nVector.angle;
+        str << ",";
+        str << nVector.steps;
     }
 
     StorageType readsvg(const gchar * str);
-- 
cgit v1.2.3