Merge lp:~inkscape.dev/inkscape/show_handles into lp:~inkscape.dev/inkscape/trunk

[Jabiertxof]

Show Handles extension in a LPE.

[Liam P. White (liampwhite)]

Looks good for the most part. Things that need fixing are placed in diff comments.

lpe-show_handles.h needs to comply with our coding style a little bit more. Use four spaces instead of two, and don't forget the "tail."

( // vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 : )

review: Needs Fixing

[lp:~inkscape.dev/inkscape/show_handles]

13508. By Jabiertxof <email address hidden> on 2014-08-11

Fixes LiamW pointed bugs on review

13509. By Jabiertxof <email address hidden> on 2014-08-11

update to trunk

[Jabiertxof (jabiertxof)]

Fixes all. Thanks Liam for the review!

review: Needs Resubmitting

[lp:~inkscape.dev/inkscape/show_handles]

13510. By Jabiertxof <email address hidden> on 2014-08-11

Code refactor: now lines draw ok when handle is degenerate or cirle handle is biger then the distance to node. also remove code duplication at loop

[Liam P. White (liampwhite)]

Looks all good now.

review: Approve

[lp:~inkscape.dev/inkscape/show_handles]

13511. By Jabiertxof <email address hidden> on 2014-08-12

fixing warning about doEffect missing

13512. By Jabiertxof <email address hidden> on 2014-08-12

update to trunk

13513. By Jabiertxof <email address hidden> on 2014-08-12

Fix warning doEffect missing

13514. By Jabiertxof <email address hidden> on 2014-08-19

update to trunk

[su_v (suv-lp)]

show_handles was added to experimental in r13480
http://bazaar.launchpad.net/~inkscape.dev/inkscape/experimental/revision/13480

experimental was merged into trunk in r13641
http://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/13641

Changing status to 'Merged'.

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2014-06-07 00:42:14 +0000
+++ po/POTFILES.in	2014-08-19 17:31:23 +0000
@@ -142,6 +142,7 @@
 src/live_effects/lpe-powerstroke.cpp
 src/live_effects/lpe-rough-hatches.cpp
 src/live_effects/lpe-ruler.cpp
+src/live_effects/lpe-show_handles.cpp
 src/live_effects/lpe-sketch.cpp
 src/live_effects/lpe-vonkoch.cpp
 src/live_effects/parameter/bool.cpp

=== modified file 'src/live_effects/CMakeLists.txt'
--- src/live_effects/CMakeLists.txt	2012-03-23 21:02:03 +0000
+++ src/live_effects/CMakeLists.txt	2014-08-19 17:31:23 +0000
@@ -29,6 +29,7 @@
 	lpe-recursiveskeleton.cpp
 	lpe-rough-hatches.cpp
 	lpe-ruler.cpp
+	lpe-show_handles.cpp
 	# lpe-skeleton.cpp
 	lpe-sketch.cpp
 	lpe-spiro.cpp
@@ -89,6 +90,7 @@
 	lpe-recursiveskeleton.h
 	lpe-rough-hatches.h
 	lpe-ruler.h
+	lpe-show_handles.h
 	lpe-skeleton.h
 	lpe-sketch.h
 	lpe-spiro.h

=== modified file 'src/live_effects/Makefile_insert'
--- src/live_effects/Makefile_insert	2012-03-23 21:02:03 +0000
+++ src/live_effects/Makefile_insert	2014-08-19 17:31:23 +0000
@@ -40,6 +40,8 @@
 	live_effects/lpe-test-doEffect-stack.h	\
 	live_effects/lpe-lattice.cpp	\
 	live_effects/lpe-lattice.h	\
+	live_effects/lpe-show_handles.cpp	\
+	live_effects/lpe-show_handles.h	\
 	live_effects/lpe-envelope.cpp	\
 	live_effects/lpe-envelope.h	\
 	live_effects/lpe-spiro.cpp	\

=== modified file 'src/live_effects/effect-enum.h'
--- src/live_effects/effect-enum.h	2012-01-12 21:06:16 +0000
+++ src/live_effects/effect-enum.h	2014-08-19 17:31:23 +0000
@@ -28,6 +28,7 @@
     PERSPECTIVE_PATH,
     SPIRO,
     LATTICE,
+    SHOW_HANDLES,
     ENVELOPE,
     CONSTRUCT_GRID,
     PERP_BISECTOR,

=== modified file 'src/live_effects/effect.cpp'
--- src/live_effects/effect.cpp	2014-05-05 08:40:12 +0000
+++ src/live_effects/effect.cpp	2014-08-19 17:31:23 +0000
@@ -25,6 +25,7 @@
 #include "live_effects/lpe-perspective_path.h"
 #include "live_effects/lpe-spiro.h"
 #include "live_effects/lpe-lattice.h"
+#include "live_effects/lpe-show_handles.h"
 #include "live_effects/lpe-envelope.h"
 #include "live_effects/lpe-constructgrid.h"
 #include "live_effects/lpe-perp_bisector.h"
@@ -120,6 +121,7 @@
 /* 0.49 */
     {POWERSTROKE,           N_("Power stroke"), "powerstroke"},
     {CLONE_ORIGINAL,        N_("Clone original path"), "clone_original"},
+    {SHOW_HANDLES,          N_("Show handles"),     "show_handles"},
 };
 const Util::EnumDataConverter<EffectType> LPETypeConverter(LPETypeData, sizeof(LPETypeData)/sizeof(*LPETypeData));
 
@@ -243,6 +245,9 @@
         case CLONE_ORIGINAL:
             neweffect = static_cast<Effect*> ( new LPECloneOriginal(lpeobj) );
             break;
+        case SHOW_HANDLES:
+            neweffect = static_cast<Effect*> ( new LPEShowHandles(lpeobj) );
+            break;
         default:
             g_warning("LivePathEffect::Effect::New   called with invalid patheffect type (%d)", lpenr);
             neweffect = NULL;

=== added file 'src/live_effects/lpe-show_handles.cpp'
--- src/live_effects/lpe-show_handles.cpp	1970-01-01 00:00:00 +0000
+++ src/live_effects/lpe-show_handles.cpp	2014-08-19 17:31:23 +0000
@@ -0,0 +1,211 @@
+/*
+ * Authors:
+ *   Jabier Arraiza Cenoz
+*
+* Copyright (C) Jabier Arraiza Cenoz 2014 <[e-mail]>
+ * Released under GNU GPL, read the file 'COPYING' for more information
+ */
+
+#include <gtkmm.h>
+#include <glibmm/i18n.h>
+#include "live_effects/lpe-show_handles.h"
+#include "live_effects/parameter/parameter.h"
+#include <2geom/sbasis-to-bezier.h>
+#include <2geom/svg-path-parser.h>
+#include "helper/geom.h"
+#include "desktop-style.h"
+#include "style.h"
+#include "svg/svg.h"
+
+namespace Inkscape {
+namespace LivePathEffect {
+
+LPEShowHandles::LPEShowHandles(LivePathEffectObject *lpeobject)
+    : Effect(lpeobject),
+      nodes(_("Show nodes"), _("Show nodes"), "nodes", &wr, this, true),
+      handles(_("Show handles"), _("Show handles"), "handles", &wr, this, true),
+      originalPath(_("Show path"), _("Show path"), "originalPath", &wr, this, true),
+      scaleNodesAndHandles(_("Scale nodes and handles"), _("Scale nodes and handles"), "scaleNodesAndHandles", &wr, this, 10)
+{
+    registerParameter(dynamic_cast<Parameter *>(&nodes));
+    registerParameter(dynamic_cast<Parameter *>(&handles));
+    registerParameter(dynamic_cast<Parameter *>(&originalPath));
+    registerParameter(dynamic_cast<Parameter *>(&scaleNodesAndHandles));
+    scaleNodesAndHandles.param_set_range(0, 500.);
+    scaleNodesAndHandles.param_set_increments(1, 1);
+    scaleNodesAndHandles.param_set_digits(2);
+    strokeWidth = 1.0;
+}
+
+bool LPEShowHandles::alertsOff = false;
+
+/**
+ * Sets default styles to element
+ * this permanently remove.some styles of the element
+ */
+
+void LPEShowHandles::doOnApply(SPLPEItem const* lpeitem)
+{
+    if(!alertsOff) {
+        char *msg = _("The \"show handles\" path effect will remove any custom style on the object you are applying it to. If this is not what you want, click Cancel.");
+        Gtk::MessageDialog dialog(msg, false, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_OK_CANCEL, true);
+        gint response = dialog.run();
+        alertsOff = true;
+        if(response == GTK_RESPONSE_CANCEL) {
+            SPLPEItem* item = const_cast<SPLPEItem*>(lpeitem);
+            item->removeCurrentPathEffect(false);
+            return;
+        }
+    }
+    SPLPEItem* item = const_cast<SPLPEItem*>(lpeitem);
+    SPCSSAttr *css = sp_repr_css_attr_new ();
+    sp_repr_css_set_property (css, "stroke", "black");
+    sp_repr_css_set_property (css, "stroke-width", "1");
+    sp_repr_css_set_property (css, "stroke-linecap", "butt");
+    sp_repr_css_set_property(css, "fill", "none");
+
+    sp_desktop_apply_css_recursive(item, css, true);
+    sp_repr_css_attr_unref (css);
+}
+
+void LPEShowHandles::doBeforeEffect (SPLPEItem const* lpeitem)
+{
+    SPItem const* item = SP_ITEM(lpeitem);
+    strokeWidth = item->style->stroke_width.computed;
+}
+
+std::vector<Geom::Path> LPEShowHandles::doEffect_path (std::vector<Geom::Path> const & path_in)
+{
+    std::vector<Geom::Path> path_out;
+    Geom::PathVector const original_pathv = pathv_to_linear_and_cubic_beziers(path_in);
+    if(originalPath) {
+        for (unsigned int i=0; i < path_in.size(); i++) {
+            path_out.push_back(path_in[i]);
+        }
+    }
+    if(!outlinepath.empty()) {
+        outlinepath.clear();
+    }
+    generateHelperPath(original_pathv);
+    for (unsigned int i=0; i < outlinepath.size(); i++) {
+        path_out.push_back(outlinepath[i]);
+    }
+    return path_out;
+}
+
+void
+LPEShowHandles::generateHelperPath(Geom::PathVector result)
+{
+    if(!handles && !nodes) {
+        return;
+    }
+
+    Geom::CubicBezier const *cubic = NULL;
+    for (Geom::PathVector::iterator path_it = result.begin(); path_it != result.end(); ++path_it) {
+        //Si está vacío...
+        if (path_it->empty()) {
+            continue;
+        }
+        //Itreadores
+        Geom::Path::const_iterator curve_it1 = path_it->begin(); // incoming curve
+        Geom::Path::const_iterator curve_it2 = ++(path_it->begin()); // outgoing curve
+        Geom::Path::const_iterator curve_endit = path_it->end_default(); // this determines when the loop has to stop
+
+        if (path_it->closed()) {
+            // if the path is closed, maybe we have to stop a bit earlier because the
+            // closing line segment has zerolength.
+            const Geom::Curve &closingline = path_it->back_closed(); // the closing line segment is always of type
+            // Geom::LineSegment.
+            if (are_near(closingline.initialPoint(), closingline.finalPoint())) {
+                // closingline.isDegenerate() did not work, because it only checks for
+                // *exact* zero length, which goes wrong for relative coordinates and
+                // rounding errors...
+                // the closing line segment has zero-length. So stop before that one!
+                curve_endit = path_it->end_open();
+            }
+        }
+        if(nodes) {
+            drawNode(curve_it1->initialPoint());
+        }
+        while (curve_it1 != curve_endit) {
+            cubic = dynamic_cast<Geom::CubicBezier const *>(&*curve_it1);
+            if (cubic) {
+                if(handles) {
+                    if(!are_near((*cubic)[0],(*cubic)[1])){
+                        drawHandle((*cubic)[1]);
+                        drawHandleLine((*cubic)[0],(*cubic)[1]);
+                    }
+                    if(!are_near((*cubic)[3],(*cubic)[2])){
+                        drawHandle((*cubic)[2]);
+                        drawHandleLine((*cubic)[3],(*cubic)[2]);
+                    }
+                }
+            }
+            if(nodes) {
+                drawNode(curve_it1->finalPoint());
+            }
+            ++curve_it1;
+            if(curve_it2 != curve_endit){
+                ++curve_it2;
+            }
+        }
+    }
+}
+
+void
+LPEShowHandles::drawNode(Geom::Point p)
+{
+    if(strokeWidth * scaleNodesAndHandles > 0.0) {
+        double diameter = strokeWidth * scaleNodesAndHandles;
+        char const * svgd;
+        svgd = "M 0.55,0.5 A 0.05,0.05 0 0 1 0.5,0.55 0.05,0.05 0 0 1 0.45,0.5 0.05,0.05 0 0 1 0.5,0.45 0.05,0.05 0 0 1 0.55,0.5 Z M 0,0 1,0 1,1 0,1 Z";
+        Geom::PathVector pathv = sp_svg_read_pathv(svgd);
+        pathv *= Geom::Affine(diameter,0,0,diameter,0,0);
+        pathv += p - Geom::Point(diameter/2,diameter/2);
+        outlinepath.push_back(pathv[0]);
+        outlinepath.push_back(pathv[1]);
+    }
+}
+
+void
+LPEShowHandles::drawHandle(Geom::Point p)
+{
+    if(strokeWidth * scaleNodesAndHandles > 0.0) {
+        double diameter = strokeWidth * scaleNodesAndHandles;
+        char const * svgd;
+        svgd = "M 0.7,0.35 A 0.35,0.35 0 0 1 0.35,0.7 0.35,0.35 0 0 1 0,0.35 0.35,0.35 0 0 1 0.35,0 0.35,0.35 0 0 1 0.7,0.35 Z";
+        Geom::PathVector pathv = sp_svg_read_pathv(svgd);
+        pathv *= Geom::Affine(diameter,0,0,diameter,0,0);
+        pathv += p - Geom::Point(diameter * 0.35,diameter * 0.35);
+        outlinepath.push_back(pathv[0]);
+    }
+}
+
+
+void
+LPEShowHandles::drawHandleLine(Geom::Point p,Geom::Point p2)
+{
+    Geom::Path path;
+    double diameter = strokeWidth * scaleNodesAndHandles;
+    if(diameter > 0.0 && Geom::distance(p,p2) > (diameter * 0.35)){
+        Geom::Ray ray2(p, p2);
+        p2 =  p2 - Geom::Point::polar(ray2.angle(),(diameter * 0.35));
+    }
+    path.start( p );
+    path.appendNew<Geom::LineSegment>( p2 );
+    outlinepath.push_back(path);
+}
+
+}; //namespace LivePathEffect
+}; /* namespace Inkscape */
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :

=== added file 'src/live_effects/lpe-show_handles.h'
--- src/live_effects/lpe-show_handles.h	1970-01-01 00:00:00 +0000
+++ src/live_effects/lpe-show_handles.h	2014-08-19 17:31:23 +0000
@@ -0,0 +1,61 @@
+#ifndef INKSCAPE_LPE_SHOW_HANDLES_H
+#define INKSCAPE_LPE_SHOW_HANDLES_H
+
+/*
+ * Authors:
+ *   Jabier Arraiza Cenoz
+*
+* Copyright (C) Jabier Arraiza Cenoz 2014 <[e-mail]>
+ * Released under GNU GPL, read the file 'COPYING' for more information
+ */
+
+#include "live_effects/effect.h"
+#include "live_effects/lpegroupbbox.h"
+#include "live_effects/parameter/bool.h"
+
+namespace Inkscape {
+namespace LivePathEffect {
+
+class LPEShowHandles : public Effect , GroupBBoxEffect {
+
+public:
+    LPEShowHandles(LivePathEffectObject *lpeobject);
+    virtual ~LPEShowHandles(){}
+
+    virtual void doOnApply(SPLPEItem const* lpeitem);
+
+    virtual void doBeforeEffect (SPLPEItem const* lpeitem);
+
+    virtual void generateHelperPath(Geom::PathVector result);
+
+    virtual void drawNode(Geom::Point p);
+
+    virtual void drawHandle(Geom::Point p);
+
+    virtual void drawHandleLine(Geom::Point p,Geom::Point p2);
+
+protected:
+
+    virtual std::vector<Geom::Path> doEffect_path (std::vector<Geom::Path> const & path_in);
+
+private:
+
+    BoolParam nodes;
+    BoolParam handles;
+    BoolParam originalPath;
+    ScalarParam scaleNodesAndHandles;
+    double strokeWidth;
+    static bool alertsOff;
+
+    Geom::PathVector outlinepath;
+
+    LPEShowHandles(const LPEShowHandles &);
+    LPEShowHandles &operator=(const LPEShowHandles &);
+
+};
+
+}; //namespace LivePathEffect
+}; //namespace Inkscape
+#endif
+
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :