From 790674255fb54e588b4b6d73ee9e15050b45d1a4 Mon Sep 17 00:00:00 2001 From: johanengelen Date: Fri, 2 Jan 2009 02:08:21 +0000 Subject: [PATCH] reorder LPE list disable test effects per default --- src/live_effects/effect-enum.h | 8 ++++---- src/live_effects/effect.cpp | 18 +++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/live_effects/effect-enum.h b/src/live_effects/effect-enum.h index 4c0d9389f..6409fecd2 100644 --- a/src/live_effects/effect-enum.h +++ b/src/live_effects/effect-enum.h @@ -11,7 +11,7 @@ #include "util/enums.h" -#define LPE_ENABLE_TEST_EFFECTS +//#define LPE_ENABLE_TEST_EFFECTS namespace Inkscape { namespace LivePathEffect { @@ -24,9 +24,6 @@ enum EffectType { ROUGH_HATCHES, VONKOCH, KNOT, -#ifdef LPE_ENABLE_TEST_EFFECTS - DOEFFECTSTACK_TEST, -#endif GEARS, CURVE_STITCH, CIRCLE_WITH_RADIUS, @@ -49,6 +46,9 @@ enum EffectType { TEXT_LABEL, PATH_LENGTH, LINE_SEGMENT, +#ifdef LPE_ENABLE_TEST_EFFECTS + DOEFFECTSTACK_TEST, +#endif INVALID_LPE // This must be last }; diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index 2a316a0bb..dc252722a 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -74,18 +74,19 @@ namespace LivePathEffect { const Util::EnumData LPETypeData[] = { // {constant defined in effect-enum.h, N_("name of your effect"), "name of your effect in SVG"} +#ifdef LPE_ENABLE_TEST_EFFECTS + {DOEFFECTSTACK_TEST, N_("doEffect stack test"), "doeffectstacktest"}, +#endif {ANGLE_BISECTOR, N_("Angle bisector"), "angle_bisector"}, {BEND_PATH, N_("Bend"), "bend_path"}, {BOOLOPS, N_("Boolops"), "boolops"}, {CIRCLE_WITH_RADIUS, N_("Circle (by center and radius)"), "circle_with_radius"}, {CIRCLE_3PTS, N_("Circle by 3 points"), "circle_3pts"}, {CONSTRUCT_GRID, N_("Construct grid"), "construct_grid"}, -#ifdef LPE_ENABLE_TEST_EFFECTS - {DOEFFECTSTACK_TEST, N_("doEffect stack test"), "doeffectstacktest"}, -#endif {ENVELOPE, N_("Envelope Deformation"), "envelope"}, {FREEHAND_SHAPE, N_("Freehand Shape"), "freehand_shape"}, // this is actually a special type of PatternAlongPath, used to paste shapes in pen/pencil tool {GEARS, N_("Gears"), "gears"}, + {ROUGH_HATCHES, N_("Hatches (rough)"), "rough_hatches"}, {INTERPOLATE, N_("Interpolate Sub-Paths"), "interpolate"}, {KNOT, N_("Knot"), "knot"}, {LATTICE, N_("Lattice Deformation"), "lattice"}, @@ -100,7 +101,6 @@ const Util::EnumData LPETypeData[] = { {COPY_ROTATE, N_("Rotate copies"), "copy_rotate"}, {RULER, N_("Ruler"), "ruler"}, {SKETCH, N_("Sketch"), "sketch"}, - {ROUGH_HATCHES, N_("Hatches (rough)"), "rough_hatches"}, {SPIRO, N_("Spiro spline"), "spiro"}, {CURVE_STITCH, N_("Stitch Sub-Paths"), "curvestitching"}, {TANGENT_TO_CURVE, N_("Tangent to curve"), "tangent_to_curve"}, @@ -148,11 +148,6 @@ Effect::New(EffectType lpenr, LivePathEffectObject *lpeobj) case KNOT: neweffect = static_cast ( new LPEKnot(lpeobj) ); break; -#ifdef LPE_ENABLE_TEST_EFFECTS - case DOEFFECTSTACK_TEST: - neweffect = static_cast ( new LPEdoEffectStackTest(lpeobj) ); - break; -#endif case GEARS: neweffect = static_cast ( new LPEGears(lpeobj) ); break; @@ -219,6 +214,11 @@ Effect::New(EffectType lpenr, LivePathEffectObject *lpeobj) case LINE_SEGMENT: neweffect = static_cast ( new LPELineSegment(lpeobj) ); break; +#ifdef LPE_ENABLE_TEST_EFFECTS + case DOEFFECTSTACK_TEST: + neweffect = static_cast ( new LPEdoEffectStackTest(lpeobj) ); + break; +#endif default: g_warning("LivePathEffect::Effect::New called with invalid patheffect type (%d)", lpenr); neweffect = NULL; -- 2.30.2