Fix a bug delete BSpline LPE from a path retain some BSpline properties

(bzr r11950.1.206)

3 files changed, 72 insertions, 59 deletions

diff --git a/src/ui/tool/node.cpp b/src/ui/tool/node.cpp
index 230d39e2e..af823a787 100644
--- a/src/ui/tool/node.cpp
+++ b/src/ui/tool/node.cpp
@@ -28,9 +28,9 @@
 #include "ui/tool/node.h"
 #include "ui/tool/path-manipulator.h"
 #include <gdk/gdkkeysyms.h>
-//BSpline
+
 #include <math.h>
-//BSpline End;
+;
 
 namespace {
 
@@ -137,10 +137,10 @@ void Handle::move(Geom::Point const &new_pos)
     Node *node_away = _parent->nodeAwayFrom(this); // node in the opposite direction
     Handle *towards = node_towards ? node_towards->handleAwayFrom(_parent) : NULL;
     Handle *towards_second = node_towards ? node_towards->handleToward(_parent) : NULL;
-    //BSpline
+    
     Handle *h = NULL;
     Handle *h2 = NULL;
-    //BSpline End
+    _pm().BSpline();
     if (Geom::are_near(new_pos, _parent->position())) {
         // The handle becomes degenerate.
         // Adjust node type as necessary.
@@ -171,7 +171,7 @@ void Handle::move(Geom::Point const &new_pos)
             }
         }
         setPosition(new_pos);
-        //BSpline
+        
         if(_pm().isBSpline){
             h = this;
             setPosition(_pm().BSplineHandleReposition(h));
@@ -194,7 +194,7 @@ void Handle::move(Geom::Point const &new_pos)
             h2->setPosition(_pm().BSplineHandleReposition(h2,_parent->bsplineWeight));
             //}
         }
-        //BSpline End
+        
         return;
     }
 
@@ -206,7 +206,7 @@ void Handle::move(Geom::Point const &new_pos)
         Geom::Point new_delta = (Geom::dot(delta, direction)
             / Geom::L2sq(direction)) * direction;
         setRelativePos(new_delta);
-        //BSpline
+        
         if(_pm().isBSpline){
             h = this;
             setPosition(_pm().BSplineHandleReposition(h));
@@ -229,7 +229,7 @@ void Handle::move(Geom::Point const &new_pos)
             h2->setPosition(_pm().BSplineHandleReposition(h2,_parent->bsplineWeight));
             //}
         }
-        //BSpline End
+        
         return;
     }
 
@@ -249,7 +249,7 @@ void Handle::move(Geom::Point const &new_pos)
     default: break;
     }
     setPosition(new_pos);
-    //BSpline
+    
     if(_pm().isBSpline){
         h = this;
         setPosition(_pm().BSplineHandleReposition(h));
@@ -272,7 +272,7 @@ void Handle::move(Geom::Point const &new_pos)
         h2->setPosition(_pm().BSplineHandleReposition(h2,_parent->bsplineWeight));
         //}
     }
-    //BSpline End
+    
 }
 
 void Handle::setPosition(Geom::Point const &p)
@@ -349,19 +349,20 @@ bool Handle::_eventHandler(Inkscape::UI::Tools::ToolBase *event_context, GdkEven
             break;
         default: break;
         }
-    //BSpline
+    
     case GDK_2BUTTON_PRESS:
         handle_2button_press();
         break;
-    //BSpline End
+    
     default: break;
     }
 
     return ControlPoint::_eventHandler(event_context, event);
 }
 
-//BSpline
+
 void Handle::handle_2button_press(){
+    _pm().BSpline();
     if(_pm().isBSpline){
         Handle *h = NULL;
         Handle *h2 = NULL;
@@ -374,7 +375,7 @@ void Handle::handle_2button_press(){
         _pm().update();
     }
 }
-//BSpline End
+
 
 bool Handle::grabbed(GdkEventMotion *)
 {
@@ -392,7 +393,7 @@ void Handle::dragged(Geom::Point &new_pos, GdkEventMotion *event)
     SnapManager &sm = _desktop->namedview->snap_manager;
     bool snap = held_shift(*event) ? false : sm.someSnapperMightSnap();
     boost::optional<Inkscape::Snapper::SnapConstraint> ctrl_constraint;
-
+    _pm().BSpline();
     // with Alt, preserve length
     if (held_alt(*event)) {
         new_pos = parent_pos + Geom::unit_vector(new_pos - parent_pos) * _saved_length;
@@ -424,17 +425,17 @@ void Handle::dragged(Geom::Point &new_pos, GdkEventMotion *event)
             ctrl_constraint = Inkscape::Snapper::SnapConstraint(parent_pos, parent_pos - perp_pos);
         }
         new_pos = result;
-        //BSpline
+        
         if(_pm().isBSpline){
             Handle *h = NULL;
             _parent->bsplineWeight = 0.0000;
             h = this;
             setPosition(new_pos);
-            int steps = _pm().getSteps();
+            int steps = _pm().BSplineGetSteps();
             _parent->bsplineWeight = ceilf(_pm().BSplineHandlePosition(h)*steps)/steps;
             new_pos=_pm().BSplineHandleReposition(h,_parent->bsplineWeight);
         }
-        //BSpline End
+        
     }
 
     std::vector<Inkscape::SnapCandidatePoint> unselected;
@@ -464,7 +465,7 @@ void Handle::dragged(Geom::Point &new_pos, GdkEventMotion *event)
             sm.freeSnapReturnByRef(new_pos, SNAPSOURCE_NODE_HANDLE);
         }
         sm.unSetup();
-        //BSpline
+        
         if(_pm().isBSpline){
             Handle *h = NULL;
             _parent->bsplineWeight = 0.0000;
@@ -473,7 +474,7 @@ void Handle::dragged(Geom::Point &new_pos, GdkEventMotion *event)
             _parent->bsplineWeight = _pm().BSplineHandlePosition(h);
             new_pos=_pm().BSplineHandleReposition(h,_parent->bsplineWeight);
         }
-        //BSpline End
+        
     }
 
 
@@ -674,9 +675,10 @@ void Node::move(Geom::Point const &new_pos)
     // move handles when the node moves.
     Geom::Point old_pos = position();
     Geom::Point delta = new_pos - position();
-    //BSpline 
+     
     double prevPos = 0.0000;
     double nextPos = 0.0000;
+    _pm().BSpline();
     Node *n = this;
     Node * nextNode = n->nodeToward(n->front());
     Node * prevNode = n->nodeToward(n->back());
@@ -689,23 +691,23 @@ void Node::move(Geom::Point const &new_pos)
         if(nextNode)
             nextPos = _pm().BSplineHandlePosition(nextNode->back());
     }
-    //BSpline End
+    
     setPosition(new_pos);
-    //BSpline
+    
     if(_pm().isBSpline){
         if(prevNode)
             prevNode->front()->setPosition(_pm().BSplineHandleReposition(prevNode->front(),prevPos));
         if(nextNode)
             nextNode->back()->setPosition(_pm().BSplineHandleReposition(nextNode->back(),nextPos));
     }
-    //BSpline End
+    
     _front.setPosition(_front.position() + delta);
     _back.setPosition(_back.position() + delta);
-    //BSpline End
+    
     // if the node has a smooth handle after a line segment, it should be kept colinear
     // with the segment
     _fixNeighbors(old_pos, new_pos);
-    //BSpline
+    
     if(_pm().isBSpline){
         Handle* front = &_front;
         Handle* back = &_back;
@@ -724,6 +726,7 @@ void Node::transform(Geom::Affine const &m)
     /* Affine transforms keep handle invariants for smooth and symmetric nodes,
      * but smooth nodes at ends of linear segments and auto nodes need special treatment */
     _fixNeighbors(old_pos, position());
+    _pm().BSpline();
     if(_pm().isBSpline){
         _front.setPosition(_pm().BSplineHandleReposition(this->front(),this->bsplineWeight));
         _back.setPosition(_pm().BSplineHandleReposition(this->back(),this->bsplineWeight));
@@ -914,7 +917,7 @@ void Node::setType(NodeType type, bool update_handles)
             break;
         default: break;
         }
-        //BSpline
+        _pm().BSpline();
         if(_pm().isBSpline){
             Handle* front = &_front;
             Handle* back = &_back;
@@ -923,7 +926,7 @@ void Node::setType(NodeType type, bool update_handles)
             _front.setPosition(_pm().BSplineHandleReposition(front,this->bsplineWeight));
             _back.setPosition(_pm().BSplineHandleReposition(back,this->bsplineWeight));
         }
-        //BSpline End
+        
     }
     _type = type;
     _setControlType(nodeTypeToCtrlType(_type));
@@ -1170,12 +1173,12 @@ void Node::_setState(State state)
         case STATE_CLICKED:
             mgr.setActive(_canvas_item, true);
             mgr.setPrelight(_canvas_item, false);
-            //BSpline
+            _pm().BSpline();
             if(_pm().isBSpline){
                 this->bsplineWeight = _pm().BSplineHandlePosition(this->back());
                 _pm().BSplineNodeHandlesReposition(this);
             }
-            //BSpline End
+            
             break;
     }
     SelectableControlPoint::_setState(state);
diff --git a/src/ui/tool/path-manipulator.cpp b/src/ui/tool/path-manipulator.cpp
index e66c6a899..fd421e587 100644
--- a/src/ui/tool/path-manipulator.cpp
+++ b/src/ui/tool/path-manipulator.cpp
@@ -43,9 +43,9 @@
 #include "ui/tool/multi-path-manipulator.h"
 #include "xml/node.h"
 #include "xml/node-observer.h"
-//BSpline
+
 #include "live_effects/lpe-bspline.h"
-//BSpline end
+
 
 namespace Inkscape {
 namespace UI {
@@ -150,20 +150,7 @@ PathManipulator::PathManipulator(MultiPathManipulator &mpm, SPPath *path,
         sigc::hide( sigc::mem_fun(*this, &PathManipulator::_updateOutlineOnZoomChange)));
 
     _createControlPointsFromGeometry();
-    //BSpline
-    lpe_bsp = NULL;
-
-    if (SP_IS_LPE_ITEM(_path) && _path->hasPathEffect()){
-        Inkscape::LivePathEffect::Effect* thisEffect = SP_LPE_ITEM(_path)->getPathEffectOfType(Inkscape::LivePathEffect::BSPLINE);
-        if(thisEffect){
-            lpe_bsp = dynamic_cast<LivePathEffect::LPEBSpline*>(thisEffect->getLPEObj()->get_lpe());
-        }
-    }
-
-    if(lpe_bsp){
-        isBSpline = true;
-    }
-    //BSpline End
+    BSpline();
 }
 
 PathManipulator::~PathManipulator()
@@ -681,7 +668,7 @@ unsigned PathManipulator::_deleteStretch(NodeList::iterator start, NodeList::ite
         nl.erase(start);
         start = next;
     }
-    //BSpline
+    
     if(isBSpline){
         double pos = 0.0000;
         if(start.prev()){
@@ -693,7 +680,7 @@ unsigned PathManipulator::_deleteStretch(NodeList::iterator start, NodeList::ite
             end->back()->setPosition(BSplineHandleReposition(end->back(),pos));
         }
     }
-    //BSpline End
+    
 
     return del_len;
 }
@@ -928,9 +915,9 @@ void PathManipulator::showHandles(bool show)
 /** Set the visibility of outline. */
 void PathManipulator::showOutline(bool show)
 {
-    //BSpline
+    
     if(isBSpline) show = true;
-    //BSpline
+    
     if (show == _show_outline) return;
     _show_outline = show;
     _updateOutline();
@@ -1204,10 +1191,33 @@ void PathManipulator::_createControlPointsFromGeometry()
     }
 }
 
-int PathManipulator::getSteps(){
+int PathManipulator::BSplineGetSteps(){
+    LivePathEffect::LPEBSpline *lpe_bsp = NULL;
+
+    if (SP_IS_LPE_ITEM(_path) && _path->hasPathEffect()){
+        Inkscape::LivePathEffect::Effect* thisEffect = SP_LPE_ITEM(_path)->getPathEffectOfType(Inkscape::LivePathEffect::BSPLINE);
+        if(thisEffect){
+            lpe_bsp = dynamic_cast<LivePathEffect::LPEBSpline*>(thisEffect->getLPEObj()->get_lpe());
+        }
+    }
     return lpe_bsp->steps+1;
 }
 
+void PathManipulator::BSpline(){
+    LivePathEffect::LPEBSpline *lpe_bsp = NULL;
+
+    if (SP_IS_LPE_ITEM(_path) && _path->hasPathEffect()){
+        Inkscape::LivePathEffect::Effect* thisEffect = SP_LPE_ITEM(_path)->getPathEffectOfType(Inkscape::LivePathEffect::BSPLINE);
+        if(thisEffect){
+            lpe_bsp = dynamic_cast<LivePathEffect::LPEBSpline*>(thisEffect->getLPEObj()->get_lpe());
+        }
+    }
+    isBSpline = false;
+    if(lpe_bsp){
+        isBSpline = true;
+    }
+}
+
 double PathManipulator::BSplineHandlePosition(Handle *h){
     using Geom::X;
     using Geom::Y;
diff --git a/src/ui/tool/path-manipulator.h b/src/ui/tool/path-manipulator.h
index b40a479f7..2a59df464 100644
--- a/src/ui/tool/path-manipulator.h
+++ b/src/ui/tool/path-manipulator.h
@@ -19,9 +19,9 @@
 #include <boost/weak_ptr.hpp>
 #include "ui/tool/node.h"
 #include "ui/tool/manipulator.h"
-//BSpline
+
 #include "live_effects/lpe-bspline.h"
-//BSpline end
+
 
 struct SPCanvasItem;
 class SPCurve;
@@ -97,10 +97,10 @@ public:
     NodeList::iterator subdivideSegment(NodeList::iterator after, double t);
     NodeList::iterator extremeNode(NodeList::iterator origin, bool search_selected,
     bool search_unselected, bool closest);
-    //BSpline
+    
     bool isBSpline;
-    int getSteps();
-    //BSpline End
+    int BSplineGetSteps();
+    
     // this is necessary for Tab-selection in MultiPathManipulator
     SubpathList &subpathList() { return _subpaths; }
 
@@ -110,13 +110,13 @@ private:
     typedef boost::shared_ptr<NodeList> SubpathPtr;
 
     void _createControlPointsFromGeometry();
-    //BSpline
-    LivePathEffect::LPEBSpline *lpe_bsp;
+
+    void BSpline();
     double BSplineHandlePosition(Handle *h);
     Geom::Point BSplineHandleReposition(Handle *h);
     Geom::Point BSplineHandleReposition(Handle *h,double pos);
     void BSplineNodeHandlesReposition(Node *n);
-    //BSpline End
+    
     void _createGeometryFromControlPoints(bool alert_LPE = false);
     unsigned _deleteStretch(NodeList::iterator first, NodeList::iterator last, bool keep_shape);
     std::string _createTypeString();