rename LPESkeletalStrokes -> LPEPatternAlongPath

(bzr r5386)

6 files changed, 42 insertions, 42 deletions

diff --git a/src/live_effects/CMakeLists.txt b/src/live_effects/CMakeLists.txt
index d437e40f9..f88e96531 100644
--- a/src/live_effects/CMakeLists.txt
+++ b/src/live_effects/CMakeLists.txt
@@ -15,8 +15,8 @@ lpeobject-reference.cpp
 lpeobject-reference.h
 lpe-bendpath.cpp
 lpe-bendpath.h
-lpe-skeletalstrokes.cpp
-lpe-skeletalstrokes.h
+lpe-patternalongpath.cpp
+lpe-patternalongpath.h
 lpe-skeleton.cpp
 lpe-skeleton.h
 lpe-sketch.cpp
diff --git a/src/live_effects/Makefile_insert b/src/live_effects/Makefile_insert
index 7d2121c12..798ad5496 100644
--- a/src/live_effects/Makefile_insert
+++ b/src/live_effects/Makefile_insert
@@ -16,8 +16,8 @@ live_effects_liblive_effects_a_SOURCES = \
 	live_effects/lpeobject-reference.h	\
 	live_effects/n-art-bpath-2geom.cpp	\
 	live_effects/n-art-bpath-2geom.h	\
-	live_effects/lpe-skeletalstrokes.cpp	\
-	live_effects/lpe-skeletalstrokes.h	\
+	live_effects/lpe-patternalongpath.cpp	\
+	live_effects/lpe-patternalongpath.h	\
 	live_effects/lpe-bendpath.cpp	\
 	live_effects/lpe-bendpath.h	\
 	live_effects/lpe-sketch.cpp	\
diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp
index 4b3ee5b0f..51a59f1a1 100644
--- a/src/live_effects/effect.cpp
+++ b/src/live_effects/effect.cpp
@@ -32,7 +32,7 @@
 
 
 // include effects:
-#include "live_effects/lpe-skeletalstrokes.h"
+#include "live_effects/lpe-patternalongpath.h"
 #include "live_effects/lpe-bendpath.h"
 #include "live_effects/lpe-sketch.h"
 #include "live_effects/lpe-vonkoch.h"
@@ -53,7 +53,7 @@ namespace LivePathEffect {
 const Util::EnumData<EffectType> LPETypeData[INVALID_LPE] = {
     // {constant defined in effect.h, N_("name of your effect"), "name of your effect in SVG"}
     {BEND_PATH,             N_("Bend"),                  "bend_path"},
-    {SKELETAL_STROKES,      N_("Pattern Along Path"),    "skeletal"},
+    {PATTERN_ALONG_PATH,    N_("Pattern Along Path"),    "skeletal"},   // for historic reasons, this effect is called skeletal(strokes) in Inkscape:SVG
     {SKETCH,                N_("Sketch"),                "sketch"},
     {VONKOCH,               N_("VonKoch"),               "vonkoch"},
     {KNOT,                  N_("Knot"),                  "knot"},
@@ -73,8 +73,8 @@ Effect::New(EffectType lpenr, LivePathEffectObject *lpeobj)
 {
     Effect* neweffect = NULL;
     switch (lpenr) {
-        case SKELETAL_STROKES:
-            neweffect = (Effect*) new LPESkeletalStrokes(lpeobj);
+        case PATTERN_ALONG_PATH:
+            neweffect = (Effect*) new LPEPatternAlongPath(lpeobj);
             break;
         case BEND_PATH:
             neweffect = (Effect*) new LPEBendPath(lpeobj);
diff --git a/src/live_effects/effect.h b/src/live_effects/effect.h
index 2f8014cc6..be3cefecf 100644
--- a/src/live_effects/effect.h
+++ b/src/live_effects/effect.h
@@ -52,7 +52,7 @@ namespace LivePathEffect {
 
 enum EffectType {
     BEND_PATH = 0,
-    SKELETAL_STROKES,
+    PATTERN_ALONG_PATH,
     SKETCH,
     VONKOCH,
     KNOT,
diff --git a/src/live_effects/lpe-skeletalstrokes.cpp b/src/live_effects/lpe-patternalongpath.cpp
index 677aa1510..9b2819219 100644
--- a/src/live_effects/lpe-skeletalstrokes.cpp
+++ b/src/live_effects/lpe-patternalongpath.cpp
@@ -1,4 +1,4 @@
-#define INKSCAPE_LPE_SKELETAL_STROKES_CPP
+#define INKSCAPE_LPE_PATTERN_ALONG_PATH_CPP
 
 /*
  * Copyright (C) Johan Engelen 2007 <j.b.c.engelen@utwente.nl>
@@ -6,7 +6,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "live_effects/lpe-skeletalstrokes.h"
+#include "live_effects/lpe-patternalongpath.h"
 #include "sp-shape.h"
 #include "display/curve.h"
 #include <libnr/n-art-bpath.h>
@@ -49,18 +49,18 @@ first) but I think we can first forget about them.
 namespace Inkscape {
 namespace LivePathEffect {
 
-static const Util::EnumData<SkelCopyType> SkelCopyTypeData[SSCT_END] = {
-    {SSCT_SINGLE,               N_("Single"),               "single"},
-    {SSCT_SINGLE_STRETCHED,     N_("Single, stretched"),    "single_stretched"},
-    {SSCT_REPEATED,             N_("Repeated"),             "repeated"},
-    {SSCT_REPEATED_STRETCHED,   N_("Repeated, stretched"),  "repeated_stretched"}
+static const Util::EnumData<PAPCopyType> PAPCopyTypeData[PAPCT_END] = {
+    {PAPCT_SINGLE,               N_("Single"),               "single"},
+    {PAPCT_SINGLE_STRETCHED,     N_("Single, stretched"),    "single_stretched"},
+    {PAPCT_REPEATED,             N_("Repeated"),             "repeated"},
+    {PAPCT_REPEATED_STRETCHED,   N_("Repeated, stretched"),  "repeated_stretched"}
 };
-static const Util::EnumDataConverter<SkelCopyType> SkelCopyTypeConverter(SkelCopyTypeData, SSCT_END);
+static const Util::EnumDataConverter<PAPCopyType> PAPCopyTypeConverter(PAPCopyTypeData, PAPCT_END);
 
-LPESkeletalStrokes::LPESkeletalStrokes(LivePathEffectObject *lpeobject) :
+LPEPatternAlongPath::LPEPatternAlongPath(LivePathEffectObject *lpeobject) :
     Effect(lpeobject),
     pattern(_("Pattern source"), _("Path to put along the skeleton path"), "pattern", &wr, this, "M0,0 L1,0"),
-    copytype(_("Pattern copies"), _("How many pattern copies to place along the skeleton path"), "copytype", SkelCopyTypeConverter, &wr, this, SSCT_SINGLE_STRETCHED),
+    copytype(_("Pattern copies"), _("How many pattern copies to place along the skeleton path"), "copytype", PAPCopyTypeConverter, &wr, this, PAPCT_SINGLE_STRETCHED),
     prop_scale(_("Width"), _("Width of the pattern"), "prop_scale", &wr, this, 1),
     scale_y_rel(_("Width in units of length"), _("Scale the width of the pattern in units of its length"), "scale_y_rel", &wr, this, false),
     spacing(_("Spacing"), _("Space between copies of the pattern. Negative values allowed, but are limited to -90% of pattern width."), "spacing", &wr, this, 0),
@@ -83,7 +83,7 @@ LPESkeletalStrokes::LPESkeletalStrokes(LivePathEffectObject *lpeobject) :
     prop_scale.param_set_increments(0.01, 0.10);
 }
 
-LPESkeletalStrokes::~LPESkeletalStrokes()
+LPEPatternAlongPath::~LPEPatternAlongPath()
 {
 
 }
@@ -114,14 +114,14 @@ split_at_discontinuities (Geom::Piecewise<Geom::D2<Geom::SBasis> > & pwsbin, dou
 
 
 Geom::Piecewise<Geom::D2<Geom::SBasis> >
-LPESkeletalStrokes::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > & pwd2_in)
+LPEPatternAlongPath::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > & pwd2_in)
 {
     using namespace Geom;
 
 /* Much credit should go to jfb and mgsloan of lib2geom development for the code below! */
     Piecewise<D2<SBasis> > output;
 
-    SkelCopyType type = copytype.get_value();
+    PAPCopyType type = copytype.get_value();
 
     D2<Piecewise<SBasis> > patternd2 = make_cuts_independant(pattern.get_pwd2());
     Piecewise<SBasis> x0 = vertical_pattern.get_value() ? Piecewise<SBasis>(patternd2[1]) : Piecewise<SBasis>(patternd2[0]);
@@ -168,21 +168,21 @@ LPESkeletalStrokes::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > & pw
         int nbCopies = 0;
         double scaling = 1;
         switch(type) {
-            case SSCT_REPEATED:
+            case PAPCT_REPEATED:
                 nbCopies = floor((uskeleton.domain().extent() - toffset + xspace)/(pattBndsX.extent()+xspace));
                 pattBndsX = Interval(pattBndsX.min(),pattBndsX.max()+xspace);
                 break;
                 
-            case SSCT_SINGLE:
+            case PAPCT_SINGLE:
                 nbCopies = (toffset + pattBndsX.extent() < uskeleton.domain().extent()) ? 1 : 0;
                 break;
                 
-            case SSCT_SINGLE_STRETCHED:
+            case PAPCT_SINGLE_STRETCHED:
                 nbCopies = 1;
                 scaling = (uskeleton.domain().extent() - toffset)/pattBndsX.extent();
                 break;
                 
-            case SSCT_REPEATED_STRETCHED:
+            case PAPCT_REPEATED_STRETCHED:
                 // if uskeleton is closed:
                 if(path_i.segs.front().at0() == path_i.segs.back().at1()){
                     nbCopies = std::floor((uskeleton.domain().extent() - toffset)/(pattBndsX.extent()+xspace));
@@ -222,7 +222,7 @@ LPESkeletalStrokes::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > & pw
 }
 
 void
-LPESkeletalStrokes::transform_multiply(Geom::Matrix const& postmul, bool set)
+LPEPatternAlongPath::transform_multiply(Geom::Matrix const& postmul, bool set)
 {
     // TODO: implement correct transformation instead of this default behavior
     Effect::transform_multiply(postmul, set);
diff --git a/src/live_effects/lpe-skeletalstrokes.h b/src/live_effects/lpe-patternalongpath.h
index bab2239b3..2909ab078 100644
--- a/src/live_effects/lpe-skeletalstrokes.h
+++ b/src/live_effects/lpe-patternalongpath.h
@@ -1,8 +1,8 @@
-#ifndef INKSCAPE_LPE_SKELETAL_STROKES_H
-#define INKSCAPE_LPE_SKELETAL_STROKES_H
+#ifndef INKSCAPE_LPE_PATTERN_ALONG_PATH_H
+#define INKSCAPE_LPE_PATTERN_ALONG_PATH_H
 
 /*
- * Inkscape::LPESkeletalStrokes
+ * Inkscape::LPEPatternAlongPath
  *
 * Copyright (C) Johan Engelen 2007 <j.b.c.engelen@utwente.nl>
  *
@@ -17,18 +17,18 @@
 namespace Inkscape {
 namespace LivePathEffect {
 
-enum SkelCopyType {
-    SSCT_SINGLE = 0,
-    SSCT_SINGLE_STRETCHED,
-    SSCT_REPEATED,
-    SSCT_REPEATED_STRETCHED,
-    SSCT_END // This must be last
+enum PAPCopyType {
+    PAPCT_SINGLE = 0,
+    PAPCT_SINGLE_STRETCHED,
+    PAPCT_REPEATED,
+    PAPCT_REPEATED_STRETCHED,
+    PAPCT_END // This must be last
 };
 
-class LPESkeletalStrokes : public Effect {
+class LPEPatternAlongPath : public Effect {
 public:
-    LPESkeletalStrokes(LivePathEffectObject *lpeobject);
-    virtual ~LPESkeletalStrokes();
+    LPEPatternAlongPath(LivePathEffectObject *lpeobject);
+    virtual ~LPEPatternAlongPath();
 
     virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > & pwd2_in);
 
@@ -36,7 +36,7 @@ public:
 
 private:
     PathParam  pattern;
-    EnumParam<SkelCopyType> copytype;
+    EnumParam<PAPCopyType> copytype;
     ScalarParam  prop_scale;
     BoolParam scale_y_rel;
     ScalarParam  spacing;
@@ -47,8 +47,8 @@ private:
 
     void on_pattern_pasted();
 
-    LPESkeletalStrokes(const LPESkeletalStrokes&);
-    LPESkeletalStrokes& operator=(const LPESkeletalStrokes&);
+    LPEPatternAlongPath(const LPEPatternAlongPath&);
+    LPEPatternAlongPath& operator=(const LPEPatternAlongPath&);
 };
 
 }; //namespace LivePathEffect