Merge lp:~inkscape+alexander/inkscape/move-boolops into lp:~inkscape.dev/inkscape/trunk

[Alexander Brock]

Move boolop functions from sp_selected_path_<op> to ObjectSet::path<op>

[lp:~inkscape+alexander/inkscape/move-boolops]

15230. By Tavmjong Bah on 2016-11-09

Enable swapping of fill and stroke when one is a mesh.

15231. By Tavmjong Bah on 2016-11-09

Click-drag selects nodes rather than creates new mesh if mesh already exists.

15232. By Mc on 2016-11-09

merge boolop branch: Move boolop functions from sp_selected_path_<op> to ObjectSet::path<op>

=== modified file 'src/livarot/LivarotDefs.h'
--- src/livarot/LivarotDefs.h	2016-04-11 12:56:03 +0000
+++ src/livarot/LivarotDefs.h	2016-11-09 00:34:30 +0000
@@ -40,18 +40,6 @@
   found_between = 4
 };
 
-// boolean operation
-enum bool_op
-{
-  bool_op_union,		// A OR B
-  bool_op_inters,		// A AND B
-  bool_op_diff,			// A \ B
-  bool_op_symdiff,  // A XOR B
-  bool_op_cut,      // coupure (pleines)
-  bool_op_slice     // coupure (contour)
-};
-typedef enum bool_op BooleanOp;
-
 // types of cap for stroking polylines
 enum butt_typ
 {
 
=== modified file 'src/livarot/Shape.h'
--- src/livarot/Shape.h	2014-03-30 22:08:13 +0000
+++ src/livarot/Shape.h	2016-11-09 00:34:30 +0000
@@ -17,6 +17,7 @@
 #include <2geom/point.h>
 
 #include "livarot/LivarotDefs.h"
+#include "object-set.h"
 
 class Path;
 class FloatLigne;
 
=== modified file 'src/livarot/int-line.h'
--- src/livarot/int-line.h	2011-10-04 05:43:09 +0000
+++ src/livarot/int-line.h	2016-11-09 00:34:30 +0000
@@ -2,6 +2,7 @@
 #define INKSCAPE_LIVAROT_INT_LINE_H
 
 #include "livarot/LivarotDefs.h"
+#include "object-set.h"
 
 /** \file
  * Coverage with integer boundaries.
 
=== modified file 'src/object-set.h'
--- src/object-set.h	2016-11-06 22:07:52 +0000
+++ src/object-set.h	2016-11-09 00:34:30 +0000
@@ -33,6 +33,29 @@
 #include "sp-item-group.h"
 #include "desktop.h"
 #include "document.h"
+#include "verbs.h"
+
+enum BoolOpErrors {
+    DONE,
+    DONE_NO_PATH,
+    DONE_NO_ACTION,
+    ERR_TOO_LESS_PATHS_1,
+    ERR_TOO_LESS_PATHS_2,
+    ERR_NO_PATHS,
+    ERR_Z_ORDER
+};
+
+// boolean operation
+enum bool_op
+{
+  bool_op_union,		// A OR B
+  bool_op_inters,		// A AND B
+  bool_op_diff,			// A \ B
+  bool_op_symdiff,  // A XOR B
+  bool_op_cut,      // coupure (pleines)
+  bool_op_slice     // coupure (contour)
+};
+typedef enum bool_op BooleanOp;
 
 class SPBox3D;
 class Persp3D;
@@ -376,7 +399,16 @@
     void toCurves(bool skip_undo = false);
     void toLPEItems();
     void pathReverse();
-    
+
+    // Boolean operations
+    // in splivarot.cpp
+    bool pathUnion(const bool skip_undo = false);
+    bool pathIntersect(const bool skip_undo = false);
+    bool pathDiff(const bool skip_undo = false);
+    bool pathSymDiff(const bool skip_undo = false);
+    bool pathCut(const bool skip_undo = false);
+    bool pathSlice(const bool skip_undo = false);
+
     //Other path operations
     //in selection-chemistry.cpp
     void toMarker(bool apply = true);
@@ -438,6 +470,9 @@
     std::list<SPBox3D *> _3dboxes;
     std::unordered_map<SPObject*, sigc::connection> _releaseConnections;
 
+private:
+    BoolOpErrors pathBoolOp(bool_op bop, const bool skip_undo, const unsigned int verb = SP_VERB_NONE, const Glib::ustring description = "");
+
 };
 
 typedef ObjectSet::SPItemRange SPItemRange;
 
=== modified file 'src/splivarot.cpp'
--- src/splivarot.cpp	2016-09-02 19:32:55 +0000
+++ src/splivarot.cpp	2016-11-09 00:34:30 +0000
@@ -47,96 +47,51 @@
 #include "verbs.h"
 #include "2geom/svg-path-parser.h" // to get from SVG on boolean to Geom::Path
 
-enum BoolOpErrors {
-    DONE,
-    DONE_NO_PATH,
-    DONE_NO_ACTION,
-    ERR_TOO_LESS_PATHS_1,
-    ERR_TOO_LESS_PATHS_2,
-    ERR_NO_PATHS,
-    ERR_Z_ORDER
-};
-
 using Inkscape::DocumentUndo;
 
 bool   Ancetre(Inkscape::XML::Node *a, Inkscape::XML::Node *who);
 
-void sp_selected_path_boolop_ui(Inkscape::Selection *selection, SPDesktop *desktop, bool_op bop,
-                                const unsigned int verb = SP_VERB_NONE, const Glib::ustring description = "");
-BoolOpErrors sp_selected_path_boolop(Inkscape::ObjectSet *set, bool_op bop);
 void sp_selected_path_do_offset(SPDesktop *desktop, bool expand, double prefOffset);
 void sp_selected_path_create_offset_object(SPDesktop *desktop, int expand, bool updating);
 
-void
-sp_selected_path_union(Inkscape::Selection *selection, SPDesktop *desktop)
-{
-    sp_selected_path_boolop_ui(selection, desktop, bool_op_union, SP_VERB_SELECTION_UNION, _("Union"));
-}
-
-void
-sp_selected_path_union_skip_undo(Inkscape::ObjectSet *set)
-{
-    sp_selected_path_boolop(set, bool_op_union);
-}
-
-void
-sp_selected_path_intersect(Inkscape::Selection *selection, SPDesktop *desktop)
-{
-    sp_selected_path_boolop_ui(selection, desktop, bool_op_inters, SP_VERB_SELECTION_INTERSECT, _("Intersection"));
-}
-
-void
-sp_selected_path_intersect_skip_undo(Inkscape::ObjectSet *set)
-{
-    sp_selected_path_boolop(set, bool_op_inters);
-}
-
-void
-sp_selected_path_diff(Inkscape::Selection *selection, SPDesktop *desktop)
-{
-    sp_selected_path_boolop_ui(selection, desktop, bool_op_diff, SP_VERB_SELECTION_DIFF, _("Difference"));
-}
-
-void
-sp_selected_path_diff_skip_undo(Inkscape::ObjectSet *set)
-{
-    sp_selected_path_boolop(set, bool_op_diff);
-}
-
-void
-sp_selected_path_symdiff(Inkscape::Selection *selection, SPDesktop *desktop)
-{
-    sp_selected_path_boolop_ui(selection, desktop, bool_op_symdiff, SP_VERB_SELECTION_SYMDIFF, _("Exclusion"));
-}
-
-void
-sp_selected_path_symdiff_skip_undo(Inkscape::ObjectSet *set)
-{
-    sp_selected_path_boolop(set, bool_op_symdiff);
-}
-
-void
-sp_selected_path_cut(Inkscape::Selection *selection, SPDesktop *desktop)
-{
-    sp_selected_path_boolop_ui(selection, desktop, bool_op_cut, SP_VERB_SELECTION_CUT, _("Division"));
-}
-
-void
-sp_selected_path_cut_skip_undo(Inkscape::ObjectSet *set)
-{
-    sp_selected_path_boolop(set, bool_op_cut);
-}
-
-void
-sp_selected_path_slice(Inkscape::Selection *selection, SPDesktop *desktop)
-{
-    sp_selected_path_boolop_ui(selection, desktop, bool_op_slice, SP_VERB_SELECTION_SLICE, _("Cut path"));
-}
-
-void
-sp_selected_path_slice_skip_undo(Inkscape::ObjectSet *set)
-{
-    sp_selected_path_boolop(set, bool_op_slice);
+bool Inkscape::ObjectSet::pathUnion(const bool skip_undo) {
+    BoolOpErrors result = pathBoolOp(bool_op_union, skip_undo, SP_VERB_SELECTION_UNION, _("Union"));
+    return DONE == result;
+}
+
+bool
+Inkscape::ObjectSet::pathIntersect(const bool skip_undo)
+{
+    BoolOpErrors result = pathBoolOp(bool_op_inters, skip_undo, SP_VERB_SELECTION_INTERSECT, _("Intersection"));
+    return DONE == result;
+}
+
+bool
+Inkscape::ObjectSet::pathDiff(const bool skip_undo)
+{
+    BoolOpErrors result = pathBoolOp(bool_op_diff, skip_undo, SP_VERB_SELECTION_DIFF, _("Difference"));
+    return DONE == result;
+}
+
+bool
+Inkscape::ObjectSet::pathSymDiff(const bool skip_undo)
+{
+    BoolOpErrors result = pathBoolOp(bool_op_symdiff, skip_undo, SP_VERB_SELECTION_SYMDIFF, _("Exclusion"));
+    return DONE == result;
+}
+
+bool
+Inkscape::ObjectSet::pathCut(const bool skip_undo)
+{
+    BoolOpErrors result = pathBoolOp(bool_op_cut, skip_undo, SP_VERB_SELECTION_CUT, _("Division"));
+    return DONE == result;
+}
+
+bool
+Inkscape::ObjectSet::pathSlice(const bool skip_undo)
+{
+    BoolOpErrors result = pathBoolOp(bool_op_slice, skip_undo, SP_VERB_SELECTION_SLICE, _("Cut path"));
+    return DONE == result;
 }
 
 // helper for printing error messages, regardless of whether we have a GUI or not
@@ -352,10 +307,36 @@
 
 // boolean operations on the desktop
 // take the source paths from the file, do the operation, delete the originals and add the results
-BoolOpErrors sp_selected_path_boolop(Inkscape::ObjectSet * set, bool_op bop)
+BoolOpErrors Inkscape::ObjectSet::pathBoolOp(bool_op bop, const bool skip_undo, const unsigned int verb, const Glib::ustring description)
 {
-    SPDocument *doc = set->desktop()->getDocument();
-    std::vector<SPItem*> il(set->items().begin(), set->items().end());
+    if (nullptr != desktop() && !skip_undo) {
+        SPDocument *doc = desktop()->getDocument();
+        BoolOpErrors returnCode = ObjectSet::pathBoolOp(bop, true);
+        switch(returnCode) {
+        case ERR_TOO_LESS_PATHS_1:
+            boolop_display_error_message(desktop(), _("Select <b>at least 1 path</b> to perform a boolean union."));
+            break;
+        case ERR_TOO_LESS_PATHS_2:
+            boolop_display_error_message(desktop(), _("Select <b>at least 2 paths</b> to perform a boolean operation."));
+            break;
+        case ERR_NO_PATHS:
+            boolop_display_error_message(desktop(), _("One of the objects is <b>not a path</b>, cannot perform boolean operation."));
+            break;
+        case ERR_Z_ORDER:
+            boolop_display_error_message(desktop(), _("Unable to determine the <b>z-order</b> of the objects selected for difference, XOR, division, or path cut."));
+            break;
+        case DONE_NO_PATH:
+            DocumentUndo::done(doc, SP_VERB_NONE, description);
+            break;
+        case DONE:
+            DocumentUndo::done(doc, verb, description);
+            break;
+        }
+        return returnCode;
+    }
+
+    SPDocument *doc = document();
+    std::vector<SPItem*> il(items().begin(), items().end());
 
     // allow union on a single object for the purpose of removing self overlapse (svn log, revision 13334)
     if (il.size() < 2 && bop != bool_op_union) {
@@ -687,7 +668,7 @@
         for (std::vector<SPItem*>::const_iterator l = il.begin(); l != il.end(); l++){
             (*l)->deleteObject();
         }
-        set->clear();
+        clear();
 
         delete res;
         return DONE_NO_PATH;
@@ -703,7 +684,7 @@
         }
     } else {
         // find out the bottom object
-        std::vector<Inkscape::XML::Node*> sorted(set->xmlNodes().begin(), set->xmlNodes().end());
+        std::vector<Inkscape::XML::Node*> sorted(xmlNodes().begin(), xmlNodes().end());
 
         sort(sorted.begin(),sorted.end(),sp_repr_compare_position_bool);
 
@@ -731,7 +712,7 @@
     gchar *title = source->title();
     gchar *desc = source->desc();
     // remove source paths
-    set->clear();
+    clear();
     for (std::vector<SPItem*>::const_iterator l = il.begin(); l != il.end(); l++){
         // if this is the bottommost object,
         if (!strcmp(reinterpret_cast<SPObject *>(*l)->getRepr()->attribute("id"), id)) {
@@ -810,7 +791,7 @@
             // move to the saved position
             repr->setPosition(pos > 0 ? pos : 0);
 
-            set->add(doc->getObjectByRepr(repr));
+            add(doc->getObjectByRepr(repr));
             Inkscape::GC::release(repr);
 
             delete resPath[i];
@@ -845,7 +826,7 @@
         }
         repr->setPosition(pos > 0 ? pos : 0);
 
-        set->add(doc->getObjectByRepr(repr));
+        add(doc->getObjectByRepr(repr));
         Inkscape::GC::release(repr);
     }
 
@@ -858,36 +839,6 @@
     return DONE;
 }
 
-void sp_selected_path_boolop_ui(Inkscape::Selection *selection, SPDesktop *desktop, bool_op bop, const unsigned int verb,
-                           const Glib::ustring description)
-{
-    SPDocument *doc = selection->desktop()->getDocument();
-    BoolOpErrors returnCode = sp_selected_path_boolop(selection, bop);
-    switch(returnCode) {
-        case ERR_TOO_LESS_PATHS_1:
-            boolop_display_error_message(desktop, _("Select <b>at least 1 path</b> to perform a boolean union."));
-            return;
-        case ERR_TOO_LESS_PATHS_2:
-            boolop_display_error_message(desktop, _("Select <b>at least 2 paths</b> to perform a boolean operation."));
-            return;
-        case ERR_NO_PATHS:
-            boolop_display_error_message(desktop, _("One of the objects is <b>not a path</b>, cannot perform boolean operation."));
-            return;
-        case ERR_Z_ORDER:
-            boolop_display_error_message(desktop, _("Unable to determine the <b>z-order</b> of the objects selected for difference, XOR, division, or path cut."));
-            return;
-        case DONE_NO_PATH:
-            DocumentUndo::done(doc, SP_VERB_NONE, description);
-            return;
-        case DONE:
-            DocumentUndo::done(doc, verb, description);
-            return;
-        case DONE_NO_ACTION:
-        default:
-            return;
-    }
-}
-
 static
 void sp_selected_path_outline_add_marker( SPObject *marker_object, Geom::Affine marker_transform,
                                           Geom::Scale stroke_scale, Geom::Affine transform,
 
=== modified file 'src/splivarot.h'
--- src/splivarot.h	2016-08-09 09:33:34 +0000
+++ src/splivarot.h	2016-11-09 00:34:30 +0000
@@ -10,6 +10,7 @@
 #include <2geom/forward.h>
 #include <2geom/path.h>
 #include "livarot/Path.h"
+#include "object-set.h"
 
 class SPCurve;
 class SPDesktop;
@@ -20,26 +21,6 @@
     class ObjectSet;
 }
 
-// boolean operations
-// work on the current selection
-// selection has 2 contain exactly 2 items
-
-// UPDATE: these signatures have been modified so they may work in
-// command-line mode, i.e. without a desktop. If a desktop is not
-// provided (desktop == NULL), error messages will be shown on stderr.
-void sp_selected_path_union (Inkscape::Selection *selection, SPDesktop *desktop);
-void sp_selected_path_union_skip_undo (Inkscape::ObjectSet *set);
-void sp_selected_path_intersect (Inkscape::Selection *selection, SPDesktop *desktop);
-void sp_selected_path_intersect_skip_undo (Inkscape::ObjectSet *set);
-void sp_selected_path_diff (Inkscape::Selection *selection, SPDesktop *desktop);
-void sp_selected_path_diff_skip_undo (Inkscape::ObjectSet *set);
-void sp_selected_path_symdiff (Inkscape::Selection *selection, SPDesktop *desktop);
-void sp_selected_path_symdiff_skip_undo (Inkscape::ObjectSet *set);
-void sp_selected_path_cut (Inkscape::Selection *selection, SPDesktop *desktop);
-void sp_selected_path_cut_skip_undo (Inkscape::ObjectSet *set);
-void sp_selected_path_slice (Inkscape::Selection *selection, SPDesktop *desktop);
-void sp_selected_path_slice_skip_undo (Inkscape::ObjectSet *set);
-
 // offset/inset of a curve
 // takes the fill-rule in consideration
 // offset amount is the stroke-width of the curve
 
=== modified file 'src/ui/tools/calligraphic-tool.cpp'
--- src/ui/tools/calligraphic-tool.cpp	2016-08-29 20:39:07 +0000
+++ src/ui/tools/calligraphic-tool.cpp	2016-11-09 00:34:30 +0000
@@ -921,10 +921,10 @@
 
         if (unionize) {
             desktop->getSelection()->add(this->repr);
-            sp_selected_path_union_skip_undo(desktop->getSelection());
+            desktop->getSelection()->pathUnion(true);
         } else if (subtract) {
             desktop->getSelection()->add(this->repr);
-            sp_selected_path_diff_skip_undo(desktop->getSelection());
+            desktop->getSelection()->pathDiff(true);
         } else {
             if (this->keep_selected) {
                 desktop->getSelection()->set(this->repr);
 
=== modified file 'src/ui/tools/eraser-tool.cpp'
--- src/ui/tools/eraser-tool.cpp	2016-10-24 22:58:43 +0000
+++ src/ui/tools/eraser-tool.cpp	2016-11-09 00:34:30 +0000
@@ -714,7 +714,7 @@
                                 Inkscape::GC::release(dup); // parent takes over
                                 selection->set(dup);
                                 if (!this->nowidth) {
-                                    sp_selected_path_union_skip_undo(selection);
+                                    selection->pathUnion(true);
                                 }
                                 selection->add(item);
                                 if(item->style->fill_rule.value == SP_WIND_RULE_EVENODD){
@@ -725,9 +725,9 @@
                                     css = 0;
                                 }
                                 if (this->nowidth) {
-                                    sp_selected_path_cut_skip_undo(selection);
+                                    selection->pathCut(true);
                                 } else {
-                                    sp_selected_path_diff_skip_undo(selection);
+                                    selection->pathDiff(true);
                                 }
                                 workDone = true; // TODO set this only if something was cut.
                                 bool break_apart = prefs->getBool("/tools/eraser/break_apart", false);
@@ -762,7 +762,7 @@
                             this->repr->parent()->appendChild(dup);
                             Inkscape::GC::release(dup); // parent takes over
                             selection->set(dup);
-                            sp_selected_path_union_skip_undo(selection);
+                            selection->pathUnion(true);
                             if (bbox && bbox->intersects(*eraserBbox)) {
                                 SPClipPath *clip_path = item->clip_ref->getObject();
                                 if (clip_path) {
@@ -786,7 +786,7 @@
                                                 sp_object_unref(clip_path);
                                                 selection->raiseToTop(true);
                                                 selection->add(dup_clip);
-                                                sp_selected_path_diff_skip_undo(selection);
+                                                selection->pathDiff(true);
                                                 SPItem * clip = SP_ITEM(*(selection->items().begin()));
                                             }
                                         }
@@ -802,7 +802,7 @@
                                     rect->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
                                     selection->raiseToTop(true);
                                     selection->add(rect);
-                                    sp_selected_path_diff_skip_undo(selection);
+                                    selection->pathDiff(true);
                                 }
                                 selection->raiseToTop(true);
                                 selection->add(item);
 
=== modified file 'src/ui/tools/flood-tool.cpp'
--- src/ui/tools/flood-tool.cpp	2016-08-03 14:56:48 +0000
+++ src/ui/tools/flood-tool.cpp	2016-11-09 00:34:30 +0000
@@ -446,7 +446,7 @@
                     ngettext("Area filled, path with <b>%d</b> node created and unioned with selection.","Area filled, path with <b>%d</b> nodes created and unioned with selection.",
                     SP_PATH(reprobj)->nodesInPath()), SP_PATH(reprobj)->nodesInPath() );
                 selection->add(reprobj);
-                sp_selected_path_union_skip_undo(desktop->getSelection());
+                selection->pathUnion(true);
             } else {
                 desktop->messageStack()->flashF( Inkscape::WARNING_MESSAGE,
                     ngettext("Area filled, path with <b>%d</b> node created.","Area filled, path with <b>%d</b> nodes created.",
 
=== modified file 'src/ui/tools/spray-tool.cpp'
--- src/ui/tools/spray-tool.cpp	2016-08-03 14:56:48 +0000
+++ src/ui/tools/spray-tool.cpp	2016-11-09 00:34:30 +0000
@@ -1026,7 +1026,7 @@
                     if (unionResult) { // No need to add the very first item (initialized with NULL).
                         set->add(unionResult);
                     }
-                    sp_selected_path_union_skip_undo(set);
+                    set->pathUnion(true);
                     set->add(parent_item);
                     Inkscape::GC::release(copy);
                     did = true;
@@ -1364,7 +1364,7 @@
                                            SP_VERB_CONTEXT_SPRAY, _("Spray with clones"));
                         break;
                     case SPRAY_MODE_SINGLE_PATH:
-                        sp_selected_path_union_skip_undo(objectSet());
+                        objectSet()->pathUnion(true);
                         desktop->getSelection()->add(object_set.objects().begin(), object_set.objects().end());
                         DocumentUndo::done(this->desktop->getDocument(),
                                            SP_VERB_CONTEXT_SPRAY, _("Spray in single path"));
 
=== modified file 'src/verbs.cpp'
--- src/verbs.cpp	2016-11-06 22:07:52 +0000
+++ src/verbs.cpp	2016-11-09 00:34:30 +0000
@@ -1115,22 +1115,22 @@
     bool handled = true;
     switch (reinterpret_cast<std::size_t>(data)) {
         case SP_VERB_SELECTION_UNION:
-            sp_selected_path_union(selection, dt);
+            selection->pathUnion();
             break;
         case SP_VERB_SELECTION_INTERSECT:
-            sp_selected_path_intersect(selection, dt);
+            selection->pathIntersect();
             break;
         case SP_VERB_SELECTION_DIFF:
-            sp_selected_path_diff(selection, dt);
+            selection->pathDiff();
             break;
         case SP_VERB_SELECTION_SYMDIFF:
-            sp_selected_path_symdiff(selection, dt);
+            selection->pathSymDiff();
             break;
         case SP_VERB_SELECTION_CUT:
-            sp_selected_path_cut(selection, dt);
+            selection->pathCut();
             break;
         case SP_VERB_SELECTION_SLICE:
-            sp_selected_path_slice(selection, dt);
+            selection->pathSlice();
             break;
         case SP_VERB_SELECTION_GROW:
         {