Remove some code and make dependant of rotate copies

(bzr r15356.1.17)

3 files changed, 17 insertions, 31 deletions

diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp
index 81a512d23..9d9381294 100644
--- a/src/live_effects/effect.cpp
+++ b/src/live_effects/effect.cpp
@@ -356,7 +356,7 @@ Effect::Effect(LivePathEffectObject *lpeobject)
       sp_lpe_item(NULL),
       current_zoom(1),
       upd_params(true),
-      sp_shape(NULL),
+      sp_curve(NULL),
       provides_own_flash_paths(true), // is automatically set to false if providesOwnFlashPaths() is not overridden
       is_ready(false) // is automatically set to false if providesOwnFlashPaths() is not overridden
 {
@@ -392,9 +392,9 @@ Effect::doOnApply (SPLPEItem const*/*lpeitem*/)
 }
 
 void
-Effect::setSelectedNodePoints(std::vector<Geom::Point> selected_np)
+Effect::setSelectedNodePoints(std::vector<Geom::Point> sNP)
 {
-    selected_nodes_points = selected_np;
+    selectedNodesPoints = sNP;
 }
 
 void
@@ -404,16 +404,16 @@ Effect::setCurrentZoom(double cZ)
 }
 
 bool
-Effect::isNodePointSelected(Geom::Point const &node_point) const
+Effect::isNodePointSelected(Geom::Point const &nodePoint) const
 {
-    if (selected_nodes_points.size() > 0) {
+    if (selectedNodesPoints.size() > 0) {
         using Geom::X;
         using Geom::Y; 
-        for (std::vector<Geom::Point>::const_iterator i = selected_nodes_points.begin();
-                i != selected_nodes_points.end(); ++i) {
+        for (std::vector<Geom::Point>::const_iterator i = selectedNodesPoints.begin();
+                i != selectedNodesPoints.end(); ++i) {
             Geom::Point p = *i;
             Geom::Affine transformCoordinate = sp_lpe_item->i2dt_affine();
-            Geom::Point p2(node_point[X], node_point[Y]);
+            Geom::Point p2(nodePoint[X],nodePoint[Y]);
             p2 *= transformCoordinate;
             if (Geom::are_near(p, p2, 0.01)) {
                 return true;
@@ -446,24 +446,21 @@ void Effect::doOnVisibilityToggled(SPLPEItem const* /*lpeitem*/)
 void Effect::doOnApply_impl(SPLPEItem const* lpeitem)
 {
     sp_lpe_item = const_cast<SPLPEItem *>(lpeitem);
-    SPShape * shape = dynamic_cast<SPShape *>(sp_lpe_item);
-    if(shape){
-        setCurrentShape(shape);
-    }
+    /*sp_curve = SP_SHAPE(sp_lpe_item)->getCurve();
+    pathvector_before_effect = sp_curve->get_pathvector();*/
     doOnApply(lpeitem);
 }
 
 void Effect::doBeforeEffect_impl(SPLPEItem const* lpeitem)
 {
     sp_lpe_item = const_cast<SPLPEItem *>(lpeitem);
-    //Groups set shape in performPathEffect before each call to doEffect
+    //printf("(SPLPEITEM*) %p\n", sp_lpe_item);
     SPShape * shape = dynamic_cast<SPShape *>(sp_lpe_item);
     if(shape){
-        setCurrentShape(shape);
+        sp_curve = shape->getCurve();
+        pathvector_before_effect = sp_curve->get_pathvector();
     }
-    //printf("(SPLPEITEM*) %p\n", sp_lpe_item);
     doBeforeEffect(lpeitem);
-
     if (apply_to_clippath_and_mask && SP_IS_GROUP(sp_lpe_item)) {
         sp_lpe_item->apply_to_clippath(sp_lpe_item);
         sp_lpe_item->apply_to_mask(sp_lpe_item);
@@ -471,16 +468,6 @@ void Effect::doBeforeEffect_impl(SPLPEItem const* lpeitem)
     update_helperpath();
 }
 
-void Effect::setCurrentShape(SPShape * shape){ 
-    if(shape){
-        sp_shape = shape;
-        if (!(sp_curve = sp_shape->getCurve())) {
-            // oops
-            return;
-        }
-        pathvector_before_effect = sp_curve->get_pathvector();
-    }
-}
 /**
  * Effects can have a parameter path set before they are applied by accepting a nonzero number of
  * mouse clicks. This method activates the pen context, which waits for the specified number of
diff --git a/src/live_effects/effect.h b/src/live_effects/effect.h
index 5dfa3de29..1997ff0ca 100644
--- a/src/live_effects/effect.h
+++ b/src/live_effects/effect.h
@@ -73,8 +73,7 @@ public:
     static int acceptsNumClicks(EffectType type);
     int acceptsNumClicks() const { return acceptsNumClicks(effectType()); }
     void doAcceptPathPreparations(SPLPEItem *lpeitem);
-    SPShape * getCurrentShape(){ return sp_shape; };
-    void setCurrentShape(SPShape * shape);
+
     /*
      * isReady() indicates whether all preparations which are necessary to apply the LPE are done,
      * e.g., waiting for a parameter path either before the effect is created or when it needs a
@@ -164,10 +163,9 @@ protected:
     // instead of normally 'splitting' the path into continuous pwd2 paths and calling doEffect_pwd2 for each.
     bool concatenate_before_pwd2;
 
-    SPLPEItem * sp_lpe_item; // these get stored in doBeforeEffect_impl, and derived classes may do as they please with them.z
-    SPShape * sp_shape; // these get stored in doBeforeEffect_impl before doEffect chain, or in performPathEffects on groups, and derived classes may do as they please with them.
+    SPLPEItem * sp_lpe_item; // these get stored in doBeforeEffect_impl, and derived classes may do as they please with them.
     double current_zoom;
-    std::vector<Geom::Point> selected_nodes_points;
+    std::vector<Geom::Point> selectedNodesPoints;
     SPCurve * sp_curve;
     Geom::PathVector pathvector_before_effect;
 private:
diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp
index 250f6aa29..813f25d3d 100644
--- a/src/live_effects/lpe-copy_rotate.cpp
+++ b/src/live_effects/lpe-copy_rotate.cpp
@@ -125,6 +125,7 @@ void
 LPECopyRotate::transform_multiply(Geom::Affine const& postmul, bool set)
 {
     // cycle through all parameters. Most parameters will not need transformation, but path and point params do.
+
     for (std::vector<Parameter *>::iterator it = param_vector.begin(); it != param_vector.end(); ++it) {
         Parameter * param = *it;
         param->param_transform_multiply(postmul, set);