fixed hide knots and removed unused headers

(bzr r13645.1.61)

2 files changed, 9 insertions, 12 deletions

diff --git a/src/live_effects/lpe-fillet-chamfer.cpp b/src/live_effects/lpe-fillet-chamfer.cpp
index 0f767435f..6775fa000 100644
--- a/src/live_effects/lpe-fillet-chamfer.cpp
+++ b/src/live_effects/lpe-fillet-chamfer.cpp
@@ -16,17 +16,13 @@
 
 
 #include "live_effects/lpe-fillet-chamfer.h"
-#include <2geom/pointwise.h>
 #include <2geom/satellite.h>
 #include <2geom/satellite-enum.h>
-#include <2geom/svg-elliptical-arc.h>
-#include <2geom/sbasis-to-bezier.h>
-#include "helper/geom-nodetype.h"
-#include "helper/geom-curves.h"
 #include "helper/geom.h"
 #include "display/curve.h"
+#include "helper/geom-curves.h"
+#include <2geom/svg-elliptical-arc.h>
 #include "knotholder.h"
-#include <vector>
 // TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
 
@@ -46,7 +42,7 @@ LPEFilletChamfer::LPEFilletChamfer(LivePathEffectObject *lpeobject) :
     Effect(lpeobject),
     satellitepairarrayparam_values(_("pair_array_param"), _("pair_array_param"), "satellitepairarrayparam_values", &wr, this),
     unit(_("Unit:"), _("Unit"), "unit", &wr, this),
-    method(_("Method:"), _("Fillets methods"), "method", FMConverter, &wr, this, FM_AUTO),
+    method(_("Method:"), _("Methods to calculate the fillet or chamfer"), "method", FMConverter, &wr, this, FM_AUTO),
     radius(_("Radius (unit or %):"), _("Radius, in unit or %"), "radius", &wr, this, 0.),
     chamfer_steps(_("Chamfer steps:"), _("Chamfer steps"), "chamfer_steps", &wr, this, 1),
     flexible(_("Flexible radius size (%)"), _("Flexible radius size (%)"), "flexible", &wr, this, false),
diff --git a/src/live_effects/parameter/satellitepairarray.cpp b/src/live_effects/parameter/satellitepairarray.cpp
index dd67be6a1..0748269f4 100644
--- a/src/live_effects/parameter/satellitepairarray.cpp
+++ b/src/live_effects/parameter/satellitepairarray.cpp
@@ -195,7 +195,7 @@ void SatellitePairArrayParam::addCanvasIndicators(
 void SatellitePairArrayParam::recalculate_knots()
 {
     if(last_pointwise){
-        //_vector = last_pointwise->getSatellites();
+        _vector = last_pointwise->getSatellites();
     }
 }
 
@@ -222,13 +222,13 @@ void SatellitePairArrayParam::addKnotHolderEntities(KnotHolder *knotholder,
         SPItem *item,
         bool mirror)
 {
-    recalculate_knots();
+    //recalculate_knots();
     for (size_t i = 0; i < _vector.size(); ++i) {
         size_t iPlus = i;
         if( mirror == true){
             iPlus = i + _vector.size();
         }
-        if(!_vector[i].second.getActive() || _vector[i].second.getHidden()){
+        if(!_vector[i].second.getActive()){
             continue;
         }
         if(!_vector[i].second.getHasMirror() && mirror == true){
@@ -282,8 +282,6 @@ FilletChamferKnotHolderEntity::FilletChamferKnotHolderEntity(SatellitePairArrayP
 { 
 }
 
-
-
 void FilletChamferKnotHolderEntity::knot_set(Point const &p,
                                               Point const &/*origin*/,
                                               guint state)
@@ -353,6 +351,7 @@ FilletChamferKnotHolderEntity::knot_get() const
     if(!_pparam->last_pointwise){
         return Point(infinity(), infinity());
     }
+    std::cout << satellite.second.getHidden() << "hiddden\n";
     if(!satellite.second.getActive() || satellite.second.getHidden()){
         return Point(infinity(), infinity());
     }
@@ -361,6 +360,8 @@ FilletChamferKnotHolderEntity::knot_get() const
     if(pwd2.size() <= (unsigned)satellite.first){
         return Point(infinity(), infinity());
     }
+    this->knot->show();
+    std::cout << satellite.second.getHidden() << "show\n";
     if( _index >= _pparam->_vector.size()){
         tmpPoint = satellite.second.getPosition(pwd2[satellite.first]);
         boost::optional<size_t> d2_prev_index = pointwise->getPrevious(satellite.first);