continuing fillet/chamfer

(bzr r13645.1.13)

4 files changed, 13 insertions, 21 deletions

diff --git a/src/live_effects/parameter/array.cpp b/src/live_effects/parameter/array.cpp
index d1d718b08..473b561d2 100644
--- a/src/live_effects/parameter/array.cpp
+++ b/src/live_effects/parameter/array.cpp
@@ -55,17 +55,16 @@ sp_svg_satellite_read_d(gchar const *str, Geom::Satellite *sat){
     }
     gchar ** strarray = g_strsplit(str, "*", 0);
     if(strarray[6] && !strarray[7]){
-        std::map< gchar const *, Geom::SatelliteType> gts = sat->GcharMapToSatelliteType;
-        sat->setSatelliteType(gts[strarray[0]]);
+        sat->setSatelliteType(strarray[0]);
         sat->setIsTime(helperfns_read_bool(strarray[1], true));
         sat->setActive(helperfns_read_bool(strarray[2], true));
         sat->setHasMirror(helperfns_read_bool(strarray[3], false));
         sat->setHidden(helperfns_read_bool(strarray[4], false));
         double time,size;
-        sp_svg_number_read_d(strarray[5], &time);
-        sp_svg_number_read_d(strarray[6], &size);
-        sat->setTime(time);
+        sp_svg_number_read_d(strarray[5], &size);
+        sp_svg_number_read_d(strarray[6], &time);
         sat->setSize(size);
+        sat->setTime(time);
         g_strfreev (strarray);
         return 1;
     }
diff --git a/src/live_effects/parameter/array.h b/src/live_effects/parameter/array.h
index ba1ed3d4e..c99777b08 100644
--- a/src/live_effects/parameter/array.h
+++ b/src/live_effects/parameter/array.h
@@ -116,19 +116,19 @@ protected:
         str << nVector.first;
         str << ",";
         std::map<Geom::SatelliteType, gchar const *> stg = nVector.second.SatelliteTypeToGcharMap;
-        str <<   stg[nVector.second.satellitetype()];
+        str <<   nVector.second.getSatelliteTypeGchar();
         str << "*";
-        str << nVector.second.isTime();
+        str << nVector.second.getIsTime();
         str << "*";
-        str << nVector.second.active();
+        str << nVector.second.getActive();
         str << "*";
-        str << nVector.second.hasMirror();
+        str << nVector.second.getHasMirror();
         str << "*";
-        str << nVector.second.hidden();
+        str << nVector.second.getHidden();
         str << "*";
-        str << nVector.second.size();
+        str << nVector.second.getSize();
         str << "*";
-        str <<nVector.second.time();
+        str <<nVector.second.getTime();
     }
 
     StorageType readsvg(const gchar * str);
diff --git a/src/live_effects/parameter/satellitepairarray.cpp b/src/live_effects/parameter/satellitepairarray.cpp
index a40e70e1f..bb72830d6 100644
--- a/src/live_effects/parameter/satellitepairarray.cpp
+++ b/src/live_effects/parameter/satellitepairarray.cpp
@@ -45,11 +45,9 @@ void SatellitePairArrayParam::set_oncanvas_looks(SPKnotShapeType shape,
 }
 
 void SatellitePairArrayParam::set_pwd2(
-    Piecewise<D2<SBasis> > const &pwd2_in,
-    Piecewise<D2<SBasis> > const &pwd2_normal_in)
+    Piecewise<D2<SBasis> > const &pwd2_in)
 {
     last_pwd2 = pwd2_in;
-    last_pwd2_normal = pwd2_normal_in;
 }
 
 void SatellitePairArrayParam::addKnotHolderEntities(KnotHolder *knotholder,
diff --git a/src/live_effects/parameter/satellitepairarray.h b/src/live_effects/parameter/satellitepairarray.h
index 82d04c790..ff1924829 100644
--- a/src/live_effects/parameter/satellitepairarray.h
+++ b/src/live_effects/parameter/satellitepairarray.h
@@ -47,14 +47,10 @@ public:
         return true;
     }
     virtual void addKnotHolderEntities(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item);
-    void set_pwd2(Geom::Piecewise<Geom::D2<Geom::SBasis> > const &pwd2_in,
-                  Geom::Piecewise<Geom::D2<Geom::SBasis> > const &pwd2_normal_in);
+    void set_pwd2(Geom::Piecewise<Geom::D2<Geom::SBasis> > const &pwd2_in);
     Geom::Piecewise<Geom::D2<Geom::SBasis> > const &get_pwd2() const {
         return last_pwd2;
     }
-    Geom::Piecewise<Geom::D2<Geom::SBasis> > const &get_pwd2_normal() const {
-        return last_pwd2_normal;
-    }
     friend class SatellitePairArrayParamKnotHolderEntity;
 
 private:
@@ -66,7 +62,6 @@ private:
     guint32 knot_color;
     
     Geom::Piecewise<Geom::D2<Geom::SBasis> > last_pwd2;
-    Geom::Piecewise<Geom::D2<Geom::SBasis> > last_pwd2_normal;
 
 };