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

[Martin Owens]

I made a new branch [1:bendFromClipboard] that make a bend liveeffect
with a full draw in clipboard using pen or pencil stroke. It use the
combo box in pen/pencil toolbox.

I have this on mind time ago but need to credit Vinícius for the videos
about his "Trace Pixel Art" feature, that refresh me.

The code is working, need review -im not a c++ developer- and has one
bug with selection. I explain:
When all is done i call to "selection->set(obj)". "obj" exist but this
code is ignored. I test it with second optional parameter to true and
the same.

Thanks in advance for test, reviews, help and feedback. Jabier.

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

12597. By Jabiertxof <email address hidden> on 2013-09-26

update to trunk

12598. By Jabiertxof <email address hidden> on 2013-10-02

update to trunk

12599. By Jabiertxof <email address hidden> on 2013-10-05

update to trunk

12600. By Jabiertxof <email address hidden> on 2013-10-13

Update to trunk

12601. By Jabiertxof <email address hidden> on 2013-10-15

Fix errors on compile and in console detected by su_v, added selection of stroke used

12602. By Jabiertxof <email address hidden> on 2013-10-15

Update to trunk

12603. By Jabiertxof <email address hidden> on 2013-10-15

Fixing errors

12604. By Jabiertxof <email address hidden> on 2013-10-16

fixing bend warnings

12605. By Jabiertxof <email address hidden> on 2013-10-16

Update to trunk

12606. By Jabiertxof <email address hidden> on 2013-10-16

fixing bend warnings

12607. By Jabiertxof <email address hidden> on 2013-10-16

fixing bend warnings

12608. By Jabiertxof <email address hidden> on 2013-10-16

fixing last applied bend

12609. By Jabiertxof <email address hidden> on 2013-10-16

Make private bend parameter like original

12610. By Jabiertxof <email address hidden> on 2013-10-16

add empty line in bend parameter like original

12611. By Jabiertxof <email address hidden> on 2013-10-16

Removed BSpline from tell by su_v

12612. By Jabiertxof <email address hidden> on 2013-10-26

Update to trunk

12613. By Jabiertxof <email address hidden> on 2013-11-03

Update to trunk

12614. By Jabiertxof <email address hidden> on 2013-11-13

Update to trunk

12615. By Jabiertxof <email address hidden> on 2013-11-16

fix error su_v tell to me

12616. By Jabiertxof <email address hidden> on 2013-11-16

fix error su_v tell to me

12617. By Jabiertxof <email address hidden> on 2013-11-16

Fix repointed by su_v

12618. By Jabiertxof <email address hidden> on 2013-11-20

Update to trunk

12619. By Jabiertxof <email address hidden> on 2014-01-12

update to trunk

12620. By Jabiertxof <email address hidden> on 2014-04-01

update to trunk

12621. By root <email address hidden> on 2014-04-01

refactor from lastApplied

12622. By Jabiertxof <email address hidden> on 2014-11-23

fixing to trunk

12623. By Jabiertxof <email address hidden> on 2014-11-23

update to trunk

12624. By Jabiertxof <email address hidden> on 2014-11-24

Fixing bend from clipboard to trunk 0.92

12625. By Jabiertxof <email address hidden> on 2014-11-24

update to trunk

12626. By Jabiertxof <email address hidden> on 2014-11-24

updated code to work on 0.92 code

[Jabiertxof (jabiertxof)]

a video on action:
https://www.youtube.com/watch?v=owBLWJ2RvLA

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

12627. By Jabiertxof <email address hidden> on 2015-03-18

update to trunk

12628. By Jabiertxof <email address hidden> on 2015-04-09

update to trunk

12629. By Jabiertxof <email address hidden> on 2015-04-09

Rename a variable to current coding style

12630. By Jabiertxof <email address hidden> on 2015-04-10

update to trunk

12631. By jabiertxof <email address hidden> on 2015-04-29

Fis fix a bug finded in my presentation in the HackFest

12632. By jabiertxof <email address hidden> on 2015-04-29

update to trunk

12633. By Jabiertxof <email address hidden> on 2015-07-24

update to trunk

[njh (njh-njhurst)]

I can't see anything wrong with this, approving.

review: Approve (style and general coding)

[Jabiertxof (jabiertxof)]

Thanks for the review Nathan!

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

12634. By Jabiertxof <email address hidden> on 2015-07-30

update to trunk

=== modified file 'src/ui/tools/freehand-base.cpp'
--- src/ui/tools/freehand-base.cpp	2015-07-27 10:21:31 +0000
+++ src/ui/tools/freehand-base.cpp	2015-07-30 17:57:19 +0000
@@ -20,6 +20,7 @@
 # include "config.h"
 #endif
 
+#include "live_effects/lpe-bendpath.h"
 #include "live_effects/lpe-patternalongpath.h"
 #include "live_effects/lpe-simplify.h"
 #include "display/canvas-bpath.h"
@@ -267,6 +268,21 @@
     lpe->getRepr()->setAttribute("offset_points", s.str().c_str());
 }
 
+static void spdc_apply_bend_shape(gchar const *svgd, FreehandBase *dc, SPItem *item)
+{
+    using namespace Inkscape::LivePathEffect;
+    if(!SP_LPE_ITEM(item)->hasPathEffectOfType(BEND_PATH)){
+        Effect::createAndApply(BEND_PATH, dc->desktop->doc(), item);
+    }
+    Effect* lpe = SP_LPE_ITEM(item)->getCurrentLPE();
+
+    // write bend parameters:
+    lpe->getRepr()->setAttribute("bendpath", svgd);
+    lpe->getRepr()->setAttribute("prop_scale", "1");
+    lpe->getRepr()->setAttribute("scale_y_rel", "false");
+    lpe->getRepr()->setAttribute("vertical", "false");
+}
+
 static void spdc_apply_simplify(std::string threshold, FreehandBase *dc, SPItem *item)
 {
     using namespace Inkscape::LivePathEffect;
@@ -282,6 +298,9 @@
     lpe->getRepr()->setAttribute("simplifyJustCoalesce", "false");
 }
 
+enum shapeType { NONE, TRIANGLE_IN, TRIANGLE_OUT, ELLIPSE, CLIPBOARD, BEND_CLIPBOARD, LAST_APPLIED };
+static shapeType previous_shape_type = NONE;
+
 static void spdc_check_for_and_apply_waiting_LPE(FreehandBase *dc, SPItem *item, SPCurve *curve)
 {
     using namespace Inkscape::LivePathEffect;
@@ -305,22 +324,25 @@
         }
 
         //Store the clipboard path to apply in the future without the use of clipboard
+
         static Geom::PathVector previous_shape_pathv;
-        enum shapeType { NONE, TRIANGLE_IN, TRIANGLE_OUT, ELLIPSE, CLIPBOARD, LAST_APPLIED };
-        static shapeType previous_shape_type = NONE;
+        
 
 
         shapeType shape = (shapeType)prefs->getInt(tool_name(dc) + "/shape", 0);
         bool shape_applied = false;
         SPCSSAttr *css_item = sp_css_attr_from_object(item, SP_STYLE_FLAG_ALWAYS);
         const char *cstroke = sp_repr_css_property(css_item, "stroke", "none");
+        static SPItem *bend_item;
 
 #define SHAPE_LENGTH 10
 #define SHAPE_HEIGHT 10
 
+
         if(shape == LAST_APPLIED){
+
             shape = previous_shape_type;
-            if(shape == CLIPBOARD){
+            if(shape == CLIPBOARD || shape == BEND_CLIPBOARD){
                 shape = LAST_APPLIED;
             }
         }
@@ -380,15 +402,52 @@
                 shape_applied = true;
                 break;
             }
+            case BEND_CLIPBOARD:
+            {
+                Inkscape::UI::ClipboardManager *cm = Inkscape::UI::ClipboardManager::get();
+                if(cm->paste(SP_ACTIVE_DESKTOP,true) == true){
+                    gchar const *svgd = item->getRepr()->attribute("d");
+                    Geom::PathVector path =  sp_svg_read_pathv(svgd);
+                    path *= item->i2doc_affine().inverse();
+                    svgd = sp_svg_write_path( path );
+                    bend_item = dc->selection->singleItem();
+                    bend_item->moveTo(item,false);
+                    spdc_apply_bend_shape(svgd, dc, bend_item);
+                    bend_item->transform = Geom::Affine(1,0,0,1,0,0);
+                    dc->selection->add(SP_OBJECT(bend_item));
+                } else {
+                    shape = NONE;
+                }
+                break;
+            }
             case LAST_APPLIED:
             {
-                if(previous_shape_pathv.size() != 0){
-                    SPCurve * c = new SPCurve();
-                    c->set_pathvector(previous_shape_pathv);
-                    spdc_paste_curve_as_freehand_shape(c, dc, item);
-                    c->unref();
+                if(previous_shape_type == CLIPBOARD){
+                    if(previous_shape_pathv.size() != 0){
+                        SPCurve * c = new SPCurve();
+                        c->set_pathvector(previous_shape_pathv);
+                        spdc_paste_curve_as_freehand_shape(c, dc, item);
+                        c->unref();
 
-                    shape_applied = true;
+                        shape_applied = true;
+                    }
+                    shape = CLIPBOARD;
+                } else {
+                    if(bend_item != NULL && bend_item->getRepr() != NULL){
+                        gchar const *svgd = item->getRepr()->attribute("d");
+                        Geom::PathVector path =  sp_svg_read_pathv(svgd);
+                        path *= item->i2doc_affine().inverse();
+                        svgd = sp_svg_write_path( path );
+                        dc->selection->add(SP_OBJECT(bend_item));
+                        sp_selection_duplicate(dc->desktop);
+                        dc->selection->remove(SP_OBJECT(bend_item));
+                        bend_item = dc->selection->singleItem();
+                        bend_item->moveTo(item,false);
+                        spdc_apply_bend_shape(svgd, dc, bend_item);
+                        bend_item->transform = Geom::Affine(1,0,0,1,0,0);
+                        dc->selection->add(SP_OBJECT(bend_item));
+                    }
+                    shape = BEND_CLIPBOARD;
                 }
                 break;
             }
@@ -667,7 +726,6 @@
 static void spdc_flush_white(FreehandBase *dc, SPCurve *gc)
 {
     SPCurve *c;
-
     if (dc->white_curves) {
         g_assert(dc->white_item);
         c = SPCurve::concat(dc->white_curves);
@@ -719,14 +777,17 @@
             // Attach repr
             SPItem *item = SP_ITEM(desktop->currentLayer()->appendChildRepr(repr));
 
-            // we finished the path; now apply any waiting LPEs or freehand shapes
             spdc_check_for_and_apply_waiting_LPE(dc, item, c);
-
-            dc->selection->set(repr);
+            if(previous_shape_type != BEND_CLIPBOARD){
+                dc->selection->set(repr);
+            }
             Inkscape::GC::release(repr);
             item->transform = SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse();
             item->updateRepr();
             item->doWriteTransform(item->getRepr(), item->transform, NULL, true);
+            if(previous_shape_type == BEND_CLIPBOARD){
+                repr->parent()->removeChild(repr);
+            }
         }
 
         DocumentUndo::done(doc, SP_IS_PEN_CONTEXT(dc)? SP_VERB_CONTEXT_PEN : SP_VERB_CONTEXT_PENCIL,

=== modified file 'src/widgets/pencil-toolbar.cpp'
--- src/widgets/pencil-toolbar.cpp	2015-07-27 00:04:29 +0000
+++ src/widgets/pencil-toolbar.cpp	2015-07-30 17:57:19 +0000
@@ -178,6 +178,7 @@
     glist = g_list_append (glist, _("Triangle out"));
     glist = g_list_append (glist, _("Ellipse"));
     glist = g_list_append (glist, _("From clipboard"));
+    glist = g_list_append (glist, _("Bend from clipboard"));
     glist = g_list_append (glist, _("Last applied"));
 
     return glist;