Refactor problem cusp nodes

(bzr r11950.3.2)

3 files changed, 143 insertions, 23 deletions

diff --git a/src/ui/tool/node.cpp b/src/ui/tool/node.cpp
index dc6e0fbae..447133b7c 100644
--- a/src/ui/tool/node.cpp
+++ b/src/ui/tool/node.cpp
@@ -13,7 +13,6 @@
 #include <glib/gi18n.h>
 #include <2geom/bezier-utils.h>
 #include <2geom/transforms.h>
-
 #include "display/sp-ctrlline.h"
 #include "display/sp-canvas.h"
 #include "display/sp-canvas-util.h"
@@ -136,6 +135,14 @@ 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
+    bool isBSpline = false;
+    double pos = 0;
+    Handle *h = this;
+    if(_pm().isBSpline()){
+        isBSpline = true;
+        //BSpline End
+    }
 
     if (Geom::are_near(new_pos, _parent->position())) {
         // The handle becomes degenerate.
@@ -167,6 +174,16 @@ void Handle::move(Geom::Point const &new_pos)
             }
         }
         setPosition(new_pos);
+        //BSpline
+        if(isBSpline){
+            setPosition(_pm().BSplineHandleReposition(h));
+            pos = _pm().BSplineHandlePosition(h);
+            other->setPosition(_pm().BSplineHandleReposition(other,pos));
+            if(pos == 0){
+                _parent->setPosition(h->position());
+            }
+        }
+        //BSpline End
         return;
     }
 
@@ -196,8 +213,17 @@ void Handle::move(Geom::Point const &new_pos)
         break;
     default: break;
     }
-
     setPosition(new_pos);
+    //BSpline
+    if(isBSpline){
+        setPosition(_pm().BSplineHandleReposition(h));
+        pos = _pm().BSplineHandlePosition(h);
+        other->setPosition(_pm().BSplineHandleReposition(other,pos));
+        if(pos == 0){
+            _parent->setPosition(h->position());
+        }
+    }
+    //BSpline End
 }
 
 void Handle::setPosition(Geom::Point const &p)
@@ -550,10 +576,26 @@ 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 pos = 0;
+    if(_pm().isBSpline()){
+        Node *n = this;
+        pos = _pm().BSplineHandlePosition(n->front());
+        if(pos == 0)
+            pos = _pm().BSplineHandlePosition(n->back());
+    }
+    //BSpline End
     setPosition(new_pos);
     _front.setPosition(_front.position() + delta);
     _back.setPosition(_back.position() + delta);
-
+    //BSpline
+    if(_pm().isBSpline()){
+        Handle* front = &_front;
+        Handle* back = &_back;
+        _front.setPosition(_pm().BSplineHandleReposition(front,pos));
+        _back.setPosition(_pm().BSplineHandleReposition(back,pos));
+    }
+    //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);
diff --git a/src/ui/tool/path-manipulator.cpp b/src/ui/tool/path-manipulator.cpp
index f1b2e12be..03e25dfa3 100644
--- a/src/ui/tool/path-manipulator.cpp
+++ b/src/ui/tool/path-manipulator.cpp
@@ -1102,7 +1102,6 @@ void PathManipulator::_createControlPointsFromGeometry()
         Geom::Curve const &cseg = pit->back_closed();
         bool fuse_ends = pit->closed()
             && Geom::are_near(cseg.initialPoint(), cseg.finalPoint());
-
         for (Geom::Path::const_iterator cit = pit->begin(); cit != pit->end_open(); ++cit) {
             Geom::Point pos = cit->finalPoint();
             Node *current_node;
@@ -1169,6 +1168,56 @@ void PathManipulator::_createControlPointsFromGeometry()
     }
 }
 
+
+bool PathManipulator::isBSpline(){
+    LivePathEffect::LPEBSpline *lpe_bsp = NULL;
+    if (SP_IS_LPE_ITEM(_path) && sp_lpe_item_has_path_effect(SP_LPE_ITEM(_path))) {
+            PathEffectList effect_list = sp_lpe_item_get_effect_list(SP_LPE_ITEM(_path));
+            lpe_bsp = dynamic_cast<LivePathEffect::LPEBSpline*>( effect_list.front()->lpeobject->get_lpe());
+    }else{
+        lpe_bsp = NULL;
+    }
+    if(lpe_bsp){
+        return true;
+    }
+    return false;
+}
+double PathManipulator::BSplineHandlePosition(Handle *h){
+    double pos = 0;
+    Node *n = h->parent();
+    Geom::D2< Geom::SBasis > SBasisInsideNodes;
+    SPCurve *lineInsideNodes = new SPCurve();
+    Node * nextNode = n->nodeToward(h);
+    if(nextNode){
+        lineInsideNodes->moveto(n->position());
+        lineInsideNodes->lineto(nextNode->position());
+        SBasisInsideNodes = lineInsideNodes->first_segment()->toSBasis();
+        pos = Geom::nearest_point(h->position(),*lineInsideNodes->first_segment());
+    }
+    return pos;
+}
+
+Geom::Point PathManipulator::BSplineHandleReposition(Handle *h){
+    double pos = 0;
+    pos = this->BSplineHandlePosition(h);
+    return BSplineHandleReposition(h,pos);
+}
+
+Geom::Point PathManipulator::BSplineHandleReposition(Handle *h,double pos){
+    Node *n = h->parent();
+    Geom::D2< Geom::SBasis > SBasisInsideNodes;
+    SPCurve *lineInsideNodes = new SPCurve();
+    Node * nextNode = n->nodeToward(h);
+    if(nextNode && pos != 0){
+        lineInsideNodes->moveto(n->position());
+        lineInsideNodes->lineto(nextNode->position());
+        SBasisInsideNodes = lineInsideNodes->first_segment()->toSBasis();
+    }else{
+        return n->position();
+    }
+    return SBasisInsideNodes.valueAt(pos);
+}
+
 /** Construct the geometric representation of nodes and handles, update the outline
  * and display
  * \param alert_LPE if true, first the LPE is warned what the new path is going to be before updating it
@@ -1183,15 +1232,55 @@ void PathManipulator::_createGeometryFromControlPoints(bool alert_LPE)
             continue;
         }
         NodeList::iterator prev = subpath->begin();
+        //BSpline
+        double pos = 0;
+        bool isBSpline = false;
+        if(this->isBSpline())
+            isBSpline = true;
+        if(isBSpline){
+            pos = BSplineHandlePosition(prev.ptr()->front());
+            prev.ptr()->front()->setPosition(BSplineHandleReposition(prev.ptr()->front(),pos));
+            if(pos == 0){
+                prev.ptr()->setPosition(prev.ptr()->front()->position());
+            }
+        }
+        //BSpline End
         builder.moveTo(prev->position());
-
         for (NodeList::iterator i = ++subpath->begin(); i != subpath->end(); ++i) {
+            //BSpline
+            if (isBSpline) {
+                pos = BSplineHandlePosition(i.ptr()->front());
+                if(pos == 0)
+                    pos = BSplineHandlePosition(i.ptr()->back());
+                i.ptr()->front()->setPosition(BSplineHandleReposition(i.ptr()->front(),pos));
+                i.ptr()->back()->setPosition(BSplineHandleReposition(i.ptr()->back(),pos));
+                if(pos == 0){
+                    i.ptr()->setPosition(i.ptr()->front()->position());
+                }
+            }
+            
+            //BSpline End
             build_segment(builder, prev.ptr(), i.ptr());
             prev = i;
         }
         if (subpath->closed()) {
             // Here we link the last and first node if the path is closed.
             // If the last segment is Bezier, we add it.
+            /*
+            //BSpline
+            if (isBSpline) {
+                pos = BSplineHandlePosition(prev.ptr()->front());
+                if(pos == 0)
+                    pos = BSplineHandlePosition(subpath->begin().ptr()->back());
+                subpath->begin().ptr()->front()->setPosition(BSplineHandleReposition(subpath->begin().ptr()->front(),pos));
+                prev.ptr()->back()->setPosition(BSplineHandleReposition(prev.ptr()->back(),pos));
+                if(pos == 0){
+                    subpath->begin().ptr()->setPosition(subpath->begin().ptr()->front()->position());
+                    prev.ptr()->setPosition(prev.ptr()->back()->position());
+                }
+            }
+            //BSpline End
+            /*/
             if (!prev->front()->isDegenerate() || !subpath->begin()->back()->isDegenerate()) {
                 build_segment(builder, prev.ptr(), subpath->begin().ptr());
             }
@@ -1200,6 +1289,7 @@ void PathManipulator::_createGeometryFromControlPoints(bool alert_LPE)
         }
         ++spi;
     }
+
     builder.finish();
     Geom::PathVector pathv = builder.peek() * (_edit_transform * _i2d_transform).inverse();
     _spcurve->set_pathvector(pathv);
@@ -1261,24 +1351,6 @@ void PathManipulator::_updateOutline()
     }
     Geom::PathVector pv = _spcurve->get_pathvector();
     pv *= (_edit_transform * _i2d_transform);
-    //BSpline
-    if (SP_IS_LPE_ITEM(_path) && sp_lpe_item_has_path_effect(SP_LPE_ITEM(_path))) {
-        PathEffectList effect_list = sp_lpe_item_get_effect_list(SP_LPE_ITEM(_path));
-        LivePathEffect::LPEBSpline *lpe_bsp = dynamic_cast<LivePathEffect::LPEBSpline*>( effect_list.front()->lpeobject->get_lpe());
-        if (lpe_bsp) {
-           Geom::PathVector pv2;
-           for (Geom::PathVector::iterator i = pv.begin(); i != pv.end(); ++i) {
-                Geom::Path &path = *i;
-                for (Geom::Path::const_iterator j = path.begin(); j != path.end_default(); ++j) {
-                    Geom::Path pv2j(j->pointAt(0));
-                    pv2j.appendNew<Geom::LineSegment>(j->pointAt(1));
-                    pv2.push_back(pv2j);
-                }
-           }
-            pv = pv2;
-        }
-    }
-    //BSpline End
     // This SPCurve thing has to be killed with extreme prejudice
     SPCurve *_hc = new SPCurve();
     if (_show_path_direction) {
diff --git a/src/ui/tool/path-manipulator.h b/src/ui/tool/path-manipulator.h
index a51b8c410..55958530d 100644
--- a/src/ui/tool/path-manipulator.h
+++ b/src/ui/tool/path-manipulator.h
@@ -104,6 +104,12 @@ private:
     typedef boost::shared_ptr<NodeList> SubpathPtr;
 
     void _createControlPointsFromGeometry();
+    //BSpline
+    bool isBSpline();
+    double BSplineHandlePosition(Handle *h);
+    Geom::Point BSplineHandleReposition(Handle *h);
+    Geom::Point BSplineHandleReposition(Handle *h,double pos);
+    //BSpline End
     void _createGeometryFromControlPoints(bool alert_LPE = false);
     unsigned _deleteStretch(NodeList::iterator first, NodeList::iterator last, bool keep_shape);
     std::string _createTypeString();