finish helper paths and beter handle of fillet/chamfer overflow. Also make the satellitepairarray LPE parameter usable for other pointwise effects, not only to fillet chamfer

(bzr r13645.1.35)

2 files changed, 17 insertions, 17 deletions

diff --git a/src/ui/dialog/lpe-fillet-chamfer-properties.cpp b/src/ui/dialog/lpe-fillet-chamfer-properties.cpp
index fe0deba57..8a6cbadad 100644
--- a/src/ui/dialog/lpe-fillet-chamfer-properties.cpp
+++ b/src/ui/dialog/lpe-fillet-chamfer-properties.cpp
@@ -123,9 +123,9 @@ FilletChamferPropertiesDialog::~FilletChamferPropertiesDialog()
 }
 
 void FilletChamferPropertiesDialog::showDialog(
-    SPDesktop *desktop, double ammount,
+    SPDesktop *desktop, double amount,
     const Inkscape::LivePathEffect::
-    SatellitePairArrayParamKnotHolderEntity *pt,
+    FilletChamferKnotHolderEntity *pt,
     const gchar *unit,
     bool use_distance,
     bool aprox_radius,
@@ -139,7 +139,7 @@ void FilletChamferPropertiesDialog::showDialog(
     dialog->_set_use_distance(use_distance);
     dialog->_set_aprox(aprox_radius);
     dialog->_set_document_unit(documentUnit);
-    dialog->_set_ammount(ammount);
+    dialog->_set_amount(amount);
     dialog->_set_satellite(satellite);
     dialog->_set_pt(pt);
 
@@ -176,7 +176,7 @@ void FilletChamferPropertiesDialog::_apply()
         } else {
             d_pos = Inkscape::Util::Quantity::convert(d_pos, unit, *document_unit);
         }
-        _satellite.setAmmount( d_pos);
+        _satellite.setAmount( d_pos);
         unsigned int steps = (unsigned int)_fillet_chamfer_chamfer_subdivisions.get_value();
         if(steps < 1){
             steps = 1;
@@ -222,14 +222,14 @@ void FilletChamferPropertiesDialog::_set_satellite(Geom::Satellite satellite)
         distance_or_radius = std::string(_("Knot distance"));
     }
     if (satellite.getIsTime()) {
-        position = ammount * 100;
+        position = amount * 100;
         _flexible = true;
         _fillet_chamfer_position_label.set_label(_("Position (%):"));
     } else {
         _flexible = false;
         std::string posConcat = Glib::ustring::compose (_("%1 (%2):"), distance_or_radius, unit);
         _fillet_chamfer_position_label.set_label(_(posConcat.c_str()));
-        position = ammount;
+        position = amount;
         position = Inkscape::Util::Quantity::convert(position, *document_unit, unit);
     }
     _fillet_chamfer_position_numeric.set_value(position);
@@ -249,10 +249,10 @@ void FilletChamferPropertiesDialog::_set_satellite(Geom::Satellite satellite)
 
 void FilletChamferPropertiesDialog::_set_pt(
     const Inkscape::LivePathEffect::
-    SatellitePairArrayParamKnotHolderEntity *pt)
+    FilletChamferKnotHolderEntity *pt)
 {
     _knotpoint = const_cast<
-                 Inkscape::LivePathEffect::SatellitePairArrayParamKnotHolderEntity *>(
+                 Inkscape::LivePathEffect::FilletChamferKnotHolderEntity *>(
                      pt);
 }
 
@@ -261,9 +261,9 @@ void FilletChamferPropertiesDialog::_set_unit(const gchar *abbr)
     unit = abbr;
 }
 
-void FilletChamferPropertiesDialog::_set_ammount(double amm)
+void FilletChamferPropertiesDialog::_set_amount(double amm)
 {
-    ammount = amm;
+    amount = amm;
 }
 
 
diff --git a/src/ui/dialog/lpe-fillet-chamfer-properties.h b/src/ui/dialog/lpe-fillet-chamfer-properties.h
index 63215d17c..6051b49d3 100644
--- a/src/ui/dialog/lpe-fillet-chamfer-properties.h
+++ b/src/ui/dialog/lpe-fillet-chamfer-properties.h
@@ -27,9 +27,9 @@ public:
         return "LayerPropertiesDialog";
     }
 
-    static void showDialog(SPDesktop *desktop, double ammount,
+    static void showDialog(SPDesktop *desktop, double amount,
                            const Inkscape::LivePathEffect::
-                           SatellitePairArrayParamKnotHolderEntity *pt,
+                           FilletChamferKnotHolderEntity *pt,
                            const gchar *unit,
                            bool use_distance,
                            bool aprox_radius,
@@ -39,7 +39,7 @@ public:
 protected:
 
     SPDesktop *_desktop;
-    Inkscape::LivePathEffect::SatellitePairArrayParamKnotHolderEntity *
+    Inkscape::LivePathEffect::FilletChamferKnotHolderEntity *
     _knotpoint;
 
     Gtk::Label _fillet_chamfer_position_label;
@@ -67,7 +67,7 @@ protected:
 
     void _set_desktop(SPDesktop *desktop);
     void _set_pt(const Inkscape::LivePathEffect::
-                SatellitePairArrayParamKnotHolderEntity *pt);
+                FilletChamferKnotHolderEntity *pt);
     void _set_unit(const gchar *abbr);
     void _set_document_unit(Glib::ustring const * abbr);
     void _set_use_distance(bool use_knot_distance);
@@ -79,9 +79,9 @@ protected:
     const gchar *unit;
     Glib::ustring const * document_unit;
     bool use_distance;
-    double ammount;
+    double amount;
     bool aprox;
-    void _set_ammount(double ammount);
+    void _set_amount(double amount);
     void _set_satellite(Geom::Satellite satellite);
     void _prepareLabelRenderer(Gtk::TreeModel::const_iterator const &row);
 
@@ -89,7 +89,7 @@ protected:
     void _handleButtonEvent(GdkEventButton *event);
 
     friend class Inkscape::LivePathEffect::
-            SatellitePairArrayParamKnotHolderEntity;
+            FilletChamferKnotHolderEntity;
 
 private:
     FilletChamferPropertiesDialog(