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)

2 files changed, 13 insertions, 13 deletions

diff --git a/src/ui/dialog/lpe-fillet-chamfer-properties.cpp b/src/ui/dialog/lpe-fillet-chamfer-properties.cpp
index 6875799f8..443a48c13 100644
--- a/src/ui/dialog/lpe-fillet-chamfer-properties.cpp
+++ b/src/ui/dialog/lpe-fillet-chamfer-properties.cpp
@@ -160,13 +160,13 @@ void FilletChamferPropertiesDialog::_apply()
     double d_pos =  _fillet_chamfer_position_numeric.get_value();
     if (d_pos >= 0) {
         if (_fillet_chamfer_type_fillet.get_active() == true) {
-            _satellite.setSatelliteType(Geom::F);
+            _satellite.satelliteType = Geom::F;
         } else if (_fillet_chamfer_type_inverse_fillet.get_active() == true) {
-            _satellite.setSatelliteType(Geom::IF);
+            _satellite.satelliteType = Geom::IF;
         } else if (_fillet_chamfer_type_inverse_chamfer.get_active() == true) {
-            _satellite.setSatelliteType(Geom::IC);
+            _satellite.satelliteType = Geom::IC;
         } else {
-            _satellite.setSatelliteType(Geom::C);
+            _satellite.satelliteType = Geom::C;
         }
         if (_flexible) {
             if (d_pos > 99.99999 || d_pos < 0) {
@@ -176,12 +176,12 @@ void FilletChamferPropertiesDialog::_apply()
         } else {
             d_pos = Inkscape::Util::Quantity::convert(d_pos, unit, document_unit);
         }
-        _satellite.setAmount( d_pos);
+        _satellite.amount = d_pos;
         size_t steps = (size_t)_fillet_chamfer_chamfer_subdivisions.get_value();
         if(steps < 1){
             steps = 1;
         }
-        _satellite.setSteps(steps);
+        _satellite.steps = steps;
         _knotpoint->knot_set_offset(_satellite);
     }
     _close();
@@ -221,7 +221,7 @@ void FilletChamferPropertiesDialog::_set_satellite(Geom::Satellite satellite)
     if(use_distance){
         distance_or_radius = std::string(_("Knot distance"));
     }
-    if (satellite.getIsTime()) {
+    if (satellite.isTime) {
         position = amount * 100;
         _flexible = true;
         _fillet_chamfer_position_label.set_label(_("Position (%):"));
@@ -233,14 +233,14 @@ void FilletChamferPropertiesDialog::_set_satellite(Geom::Satellite satellite)
         position = Inkscape::Util::Quantity::convert(position, document_unit, unit);
     }
     _fillet_chamfer_position_numeric.set_value(position);
-    _fillet_chamfer_chamfer_subdivisions.set_value(satellite.getSteps());
-    if (satellite.getSatelliteType() == Geom::F) {
+    _fillet_chamfer_chamfer_subdivisions.set_value(satellite.steps);
+    if (satellite.satelliteType == Geom::F) {
         _fillet_chamfer_type_fillet.set_active(true);
-    } else if (satellite.getSatelliteType() == Geom::IF) {
+    } else if (satellite.satelliteType == Geom::IF) {
         _fillet_chamfer_type_inverse_fillet.set_active(true);
-    } else if (satellite.getSatelliteType() == Geom::C) {
+    } else if (satellite.satelliteType == Geom::C) {
         _fillet_chamfer_type_chamfer.set_active(true);
-    } else if (satellite.getSatelliteType() == Geom::IC) {
+    } else if (satellite.satelliteType == Geom::IC) {
         _fillet_chamfer_type_inverse_chamfer.set_active(true);
     }
     _satellite = satellite;
diff --git a/src/ui/dialog/lpe-fillet-chamfer-properties.h b/src/ui/dialog/lpe-fillet-chamfer-properties.h
index 533f7af2a..1a40eea9b 100644
--- a/src/ui/dialog/lpe-fillet-chamfer-properties.h
+++ b/src/ui/dialog/lpe-fillet-chamfer-properties.h
@@ -10,7 +10,7 @@
 
 #include <2geom/point.h>
 #include <gtkmm.h>
-#include "live_effects/parameter/satellitepairarray.h"
+#include "live_effects/parameter/satellitearray.h"
 
 class SPDesktop;