fix bug -bad power- inserting nodes near cusp nodes in bspline

(bzr r13341.1.218)

1 files changed, 31 insertions, 3 deletions

diff --git a/src/ui/tool/path-manipulator.cpp b/src/ui/tool/path-manipulator.cpp
index edb74cb40..48b19ef7a 100644
--- a/src/ui/tool/path-manipulator.cpp
+++ b/src/ui/tool/path-manipulator.cpp
@@ -991,9 +991,37 @@ NodeList::iterator PathManipulator::subdivideSegment(NodeList::iterator first, d
 
         // set new handle positions
         Node *n = new Node(_multi_path_manipulator._path_data.node_data, seg2[0]);
-        n->back()->setPosition(seg1[2]);
-        n->front()->setPosition(seg2[1]);
-        n->setType(NODE_SMOOTH, false);
+        if(!isBSpline()){
+            n->back()->setPosition(seg1[2]);
+            n->front()->setPosition(seg2[1]);
+            n->setType(NODE_SMOOTH, false);
+        } else {
+            const double handleCubicGap = 0.01;
+            Geom::D2< Geom::SBasis > SBasisInsideNodes;
+            SPCurve *lineInsideNodes = new SPCurve();
+            if(second->back()->isDegenerate()){
+                lineInsideNodes->moveto(n->position());
+                lineInsideNodes->lineto(second->position());
+                SBasisInsideNodes = lineInsideNodes->first_segment()->toSBasis();
+                Geom::Point next = SBasisInsideNodes.valueAt(0.3334);
+                next = Geom::Point(next[Geom::X] + handleCubicGap,next[Geom::Y] + handleCubicGap);
+                lineInsideNodes->reset();
+                n->front()->setPosition(next);
+            }else{
+                n->front()->setPosition(seg2[1]);
+            }
+            if(first->front()->isDegenerate()){
+                lineInsideNodes->moveto(n->position());
+                lineInsideNodes->lineto(first->position());
+                SBasisInsideNodes = lineInsideNodes->first_segment()->toSBasis();
+                Geom::Point previous = SBasisInsideNodes.valueAt(0.3334);
+                previous = Geom::Point(previous[Geom::X] + handleCubicGap,previous[Geom::Y] + handleCubicGap);
+                n->back()->setPosition(previous);
+            }else{
+                n->back()->setPosition(seg1[2]);
+            }
+            n->setType(NODE_CUSP, false);
+        }
         inserted = list.insert(insert_at, n);
 
         first->front()->move(seg1[1]);