LPE Bendpath: disable width path

(bzr r4189)

2 files changed, 11 insertions, 5 deletions

diff --git a/src/live_effects/lpe-pathalongpath.cpp b/src/live_effects/lpe-pathalongpath.cpp
index 100d0428d..4837317bf 100644
--- a/src/live_effects/lpe-pathalongpath.cpp
+++ b/src/live_effects/lpe-pathalongpath.cpp
@@ -63,16 +63,20 @@ static const Util::EnumDataConverter<PAPCopyType> PAPCopyTypeConverter(PAPCopyTy
 LPEPathAlongPath::LPEPathAlongPath(LivePathEffectObject *lpeobject) :

     Effect(lpeobject),

     bend_path(_("Bend path"), _("Path along which to bend the original path"), "bendpath", &wr, this, "M0,0 L1,0"),

+/* Delayed until 0.47

     width_path(_("Width path"), _("..."), "widthpath", &wr, this, "M0,0 L1,0"),

     width_path_range(_("Width path range"), _("Range of widthpath parameter"), "widthpath_range", &wr, this, 1),

+*/

     copytype(_("Path copies"), _("How many copies to place along the skeleton path"), "copytype", PAPCopyTypeConverter, &wr, this, PAPCT_SINGLE_STRETCHED),

     prop_scale(_("Width"), _("Width of the path"), "prop_scale", &wr, this, 1),

     scale_y_rel(_("Width in units of length"), _("Scale the width of the path in units of its length"), "scale_y_rel", &wr, this, false),

     vertical_pattern(_("Original path is vertical"), "", "vertical", &wr, this, false)

 {

     registerParameter( dynamic_cast<Parameter *>(&bend_path) );

+/* Delayed until 0.47

     registerParameter( dynamic_cast<Parameter *>(&width_path) );

     registerParameter( dynamic_cast<Parameter *>(&width_path_range) );

+*/

     registerParameter( dynamic_cast<Parameter *>(&copytype) );

     registerParameter( dynamic_cast<Parameter *>(&prop_scale) );

     registerParameter( dynamic_cast<Parameter *>(&scale_y_rel) );

@@ -148,15 +152,16 @@ LPEPathAlongPath::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > & pwd2
         if (prop_scale != 1.0) y *= prop_scale;

     }

 

+/* Delayed until 0.47

     Piecewise<D2<SBasis> > widthpwd2 = arc_length_parametrization(Piecewise<D2<SBasis> >(width_path),2,.1);

     D2<Piecewise<SBasis> > widthd2pw = make_cuts_independant(widthpwd2);

     Piecewise<SBasis> width = (Piecewise<SBasis>(widthd2pw[Y]) - uskeletonbounds[Y].middle()) / width_path_range;

-

+*/

 

     double offs = 0;

     Piecewise<D2<SBasis> > output;

     for (int i=0; i<nbCopies; i++){

-        output.concat(compose(uskeleton,x+offs) + y*compose(width,x+offs)*compose(n,x+offs));

+        output.concat(compose(uskeleton,x+offs) + y*/*compose(width,x+offs)**/compose(n,x+offs));

         offs+=pattWidth;

     }

 

@@ -190,14 +195,15 @@ LPEPathAlongPath::resetDefaults(SPItem * item)
     path.appendNew<Geom::LineSegment>( end );

     bend_path.param_set_and_write_new_value( path.toPwSb() );

 

+/* Delayed until 0.47

     Point startw(bndsX.min(), bndsY.max());

     Point endw(bndsX.max(), bndsY.max());

     Geom::Path pathw;

     pathw.start( startw );

     pathw.appendNew<Geom::LineSegment>( endw );

     width_path.param_set_and_write_new_value( pathw.toPwSb() );

-    

     width_path_range.param_set_value(startw[Y]-start[Y]);

+*/

 }

 

 } // namespace LivePathEffect

diff --git a/src/live_effects/lpe-pathalongpath.h b/src/live_effects/lpe-pathalongpath.h
index 915cad8b0..be064dd04 100644
--- a/src/live_effects/lpe-pathalongpath.h
+++ b/src/live_effects/lpe-pathalongpath.h
@@ -36,8 +36,8 @@ public:
 

 private:

     PathParam  bend_path;

-    PathParam  width_path;

-    ScalarParam  width_path_range;

+    //PathParam  width_path;

+    //ScalarParam  width_path_range;

     EnumParam<PAPCopyType> copytype;

     ScalarParam  prop_scale;

     BoolParam scale_y_rel;