From 5c08bd913a218fc342938252150fedd6f2b837f1 Mon Sep 17 00:00:00 2001 From: Michael Soegtrop Date: Wed, 27 Apr 2016 19:47:22 +0200 Subject: Added emboidery and bool LPEs (bzr r14862.2.1) --- src/live_effects/effect.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'src/live_effects/effect.cpp') diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index c6ecba30a..0b77e472f 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -62,6 +62,8 @@ #include "live_effects/lpe-test-doEffect-stack.h" #include "live_effects/lpe-text_label.h" #include "live_effects/lpe-vonkoch.h" +#include "live_effects/lpe-embrodery-stitch.h" +#include "live_effects/lpe-bool.h" #include "xml/node-event-vector.h" #include "sp-object.h" @@ -151,6 +153,9 @@ const Util::EnumData LPETypeData[] = { {FILL_BETWEEN_MANY, N_("Fill between many"), "fill_between_many"}, {ELLIPSE_5PTS, N_("Ellipse by 5 points"), "ellipse_5pts"}, {BOUNDING_BOX, N_("Bounding Box"), "bounding_box"}, +/* MSoegtrop */ + {EMBRODERY_STITCH, N_("Embrodery stitch"), "embrodery_stitch"}, + {BOOL_OP, N_("Boolean operation"), "bool_op"}, }; const Util::EnumDataConverter LPETypeConverter(LPETypeData, sizeof(LPETypeData)/sizeof(*LPETypeData)); @@ -172,6 +177,14 @@ Effect::New(EffectType lpenr, LivePathEffectObject *lpeobj) { Effect* neweffect = NULL; switch (lpenr) { + case EMBRODERY_STITCH: + neweffect = static_cast ( new LPEEmbroderyStitch(lpeobj) ); + break; + + case BOOL_OP: + neweffect = static_cast ( new LPEBool(lpeobj) ); + break; + case PATTERN_ALONG_PATH: neweffect = static_cast ( new LPEPatternAlongPath(lpeobj) ); break; -- cgit v1.2.3 From cfb1e23e906e35f0d4e7bbd9fcbb047c3a3788bf Mon Sep 17 00:00:00 2001 From: Michael Soegtrop Date: Mon, 5 Jun 2017 20:59:36 +0200 Subject: fixed enum order + added cpp files to POFILES.in (bzr r14862.2.4) --- src/live_effects/effect.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/live_effects/effect.cpp') diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index 44580b9b2..e5a879241 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -118,8 +118,6 @@ const Util::EnumData LPETypeData[] = { {MIRROR_SYMMETRY, N_("Mirror symmetry"), "mirror_symmetry"}, {COPY_ROTATE, N_("Rotate copies"), "copy_rotate"}, /* Ponyscape -> Inkscape 0.92*/ - {EMBRODERY_STITCH, N_("Embrodery stitch"), "embrodery_stitch"}, - {BOOL_OP, N_("Boolean operation"), "bool_op"}, {ATTACH_PATH, N_("Attach path"), "attach_path"}, {FILL_BETWEEN_STROKES, N_("Fill between strokes"), "fill_between_strokes"}, {FILL_BETWEEN_MANY, N_("Fill between many"), "fill_between_many"}, @@ -128,6 +126,8 @@ const Util::EnumData LPETypeData[] = { /* 9.93 */ {MEASURE_LINE, N_("Measure Line"), "measure_line"}, {FILLET_CHAMFER, N_("Fillet/Chamfer"), "fillet_chamfer"}, + {BOOL_OP, N_("Boolean operation"), "bool_op"}, + {EMBRODERY_STITCH, N_("Embrodery stitch"), "embrodery_stitch"}, #ifdef LPE_ENABLE_TEST_EFFECTS {DOEFFECTSTACK_TEST, N_("doEffect stack test"), "doeffectstacktest"}, {ANGLE_BISECTOR, N_("Angle bisector"), "angle_bisector"}, @@ -171,11 +171,9 @@ Effect::New(EffectType lpenr, LivePathEffectObject *lpeobj) case EMBRODERY_STITCH: neweffect = static_cast ( new LPEEmbroderyStitch(lpeobj) ); break; - case BOOL_OP: neweffect = static_cast ( new LPEBool(lpeobj) ); break; - case PATTERN_ALONG_PATH: neweffect = static_cast ( new LPEPatternAlongPath(lpeobj) ); break; -- cgit v1.2.3