diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2018-03-02 20:49:59 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2018-03-02 20:49:59 +0000 |
| commit | 7cec7f966e2bee144373b198c5d0a5fbb36b4a44 (patch) | |
| tree | d93376fe40ef4802145231777aec99160c7ade1f /src/live_effects/effect.cpp | |
| parent | Migrate launchpad offset branch to git (diff) | |
| parent | Live effect: Ellipse from Points (diff) | |
| download | inkscape-7cec7f966e2bee144373b198c5d0a5fbb36b4a44.tar.gz inkscape-7cec7f966e2bee144373b198c5d0a5fbb36b4a44.zip | |
Merge from trunk
Diffstat (limited to 'src/live_effects/effect.cpp')
| -rw-r--r-- | src/live_effects/effect.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index 7e0276e5b..44b737ad1 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -66,6 +66,7 @@ #include "live_effects/lpe-vonkoch.h" #include "live_effects/lpe-embrodery-stitch.h" #include "live_effects/lpe-bool.h" +#include "live_effects/lpe-pts2ellipse.h" #include "live_effects/lpeobject.h" @@ -136,9 +137,10 @@ const Util::EnumData<EffectType> LPETypeData[] = { {MEASURE_SEGMENTS, N_("Measure Segments"), "measure_segments"}, {FILLET_CHAMFER, N_("Fillet/Chamfer"), "fillet_chamfer"}, {BOOL_OP, N_("Boolean operation"), "bool_op"}, - {EMBRODERY_STITCH, N_("Embroidery stitch"), "embrodery_stitch"}, + {EMBRODERY_STITCH, N_("Embroidery stitch"), "embrodery_stitch"}, {POWERCLIP, N_("Power clip"), "powerclip"}, {POWERMASK, N_("Power mask"), "powermask"}, + {PTS2ELLIPSE, N_("Ellipse from points"), "pts2ellipse"}, {OFFSET, N_("Offset"), "offset"}, #ifdef LPE_ENABLE_TEST_EFFECTS {DOEFFECTSTACK_TEST, N_("doEffect stack test"), "doeffectstacktest"}, @@ -341,6 +343,9 @@ Effect::New(EffectType lpenr, LivePathEffectObject *lpeobj) case MEASURE_SEGMENTS: neweffect = static_cast<Effect*> ( new LPEMeasureSegments(lpeobj) ); break; + case PTS2ELLIPSE: + neweffect = static_cast<Effect*> ( new LPEPts2Ellipse(lpeobj) ); + break; default: g_warning("LivePathEffect::Effect::New called with invalid patheffect type (%d)", lpenr); neweffect = NULL; |