From 1062580959edcb03cce8419e8c16dea5fa69effa Mon Sep 17 00:00:00 2001 From: Olli Parviainen Date: Sat, 8 Dec 2018 16:37:04 +0200 Subject: [PATCH 1/2] Accelerate the break-apart operation for larger paths by disabling redrawing the canvas during the break-apart algorithm is running. Testing this change with a large pathset accelerated the break-apart operation duration from 24 seconds down to mere 4 seconds. Signed-off-by: Olli Parviainen --- src/path-chemistry.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/path-chemistry.cpp b/src/path-chemistry.cpp index 9a1d67e16e..b58fa4f150 100644 --- a/src/path-chemistry.cpp +++ b/src/path-chemistry.cpp @@ -32,6 +32,7 @@ #include "verbs.h" #include "display/curve.h" +#include "display/sp-canvas.h" #include "object/box3d.h" #include "object/object-set.h" @@ -207,7 +208,8 @@ ObjectSet::breakApart(bool skip_undo) desktop()->messageStack()->flash(Inkscape::IMMEDIATE_MESSAGE, _("Breaking apart paths...")); // set "busy" cursor desktop()->setWaitingCursor(); - + // disable redrawing during the break-apart operation for remarkable speedup for large paths + desktop()->getCanvas()->_drawing_disabled = true; } bool did = false; @@ -281,9 +283,11 @@ ObjectSet::breakApart(bool skip_undo) g_free(style); g_free(path_effect); } - - if(desktop()) + + if (desktop()) { + desktop()->getCanvas()->_drawing_disabled = false; desktop()->clearWaitingCursor(); + } if (did) { if ( !skip_undo ) { -- GitLab From 0da7d01ffa1590174d76a7726da59541e5e3fe61 Mon Sep 17 00:00:00 2001 From: Olli Parviainen Date: Sat, 8 Dec 2018 23:11:46 +0200 Subject: [PATCH 2/2] Accelerate boolean path operation for larger paths by disabling redrawing the canvas during running of the break-apart algorithm. This change reduces duration of e.g. cut-path operation to a fraction of the original when working with a large path set. Signed-off-by: Olli Parviainen --- src/splivarot.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/splivarot.cpp b/src/splivarot.cpp index b986af32ea..1f4b4e9b51 100644 --- a/src/splivarot.cpp +++ b/src/splivarot.cpp @@ -38,6 +38,8 @@ #include "text-editing.h" #include "verbs.h" +#include "display/sp-canvas.h" + #include "helper/geom.h" #include "livarot/Path.h" @@ -321,7 +323,11 @@ BoolOpErrors Inkscape::ObjectSet::pathBoolOp(bool_op bop, const bool skip_undo, { if (nullptr != desktop() && !checked) { SPDocument *doc = desktop()->getDocument(); + // don't redraw the canvas during the operation as that can remarkably slow down the progress + desktop()->getCanvas()->_drawing_disabled = true; BoolOpErrors returnCode = ObjectSet::pathBoolOp(bop, true, true); + desktop()->getCanvas()->_drawing_disabled = false; + switch(returnCode) { case ERR_TOO_LESS_PATHS_1: boolop_display_error_message(desktop(), _("Select at least 1 path to perform a boolean union.")); -- GitLab