Rename branch

(bzr r13645.1.145)

1 files changed, 24 insertions, 24 deletions

diff --git a/src/live_effects/lpe-fillet-chamfer.cpp b/src/live_effects/lpe-fillet-chamfer.cpp
index 6ec711de7..56f7557ba 100644
--- a/src/live_effects/lpe-fillet-chamfer.cpp
+++ b/src/live_effects/lpe-fillet-chamfer.cpp
@@ -104,9 +104,9 @@ void LPEFilletChamfer::doOnApply(SPLPEItem const *lpeItem)
                 satellite.setSteps(chamfer_steps);
                 subpath_satellites.push_back(satellite);
             }
-            //we add the last satellite on open path because pointwise is related to nodes, not curves
+            //we add the last satellite on open path because pathVectorSatellites is related to nodes, not curves
             //so maybe in the future we can need this last satellite in other effects
-            //dont remove for this effect because pointwise class has methods when the path is modiffied
+            //dont remove for this effect because pathVectorSatellites class has methods when the path is modiffied
             //and we want one method for all uses
             if (!path_it->closed()) {
                 Satellite satellite(FILLET);
@@ -115,9 +115,9 @@ void LPEFilletChamfer::doOnApply(SPLPEItem const *lpeItem)
             }
             satellites.push_back(subpath_satellites);
         }
-        pointwise.setPathVector(pathv);
-        pointwise.setSatellites(satellites);
-        satellites_param.setPointwise(pointwise);
+        pathVectorSatellites.setPathVector(pathv);
+        pathVectorSatellites.setSatellites(satellites);
+        satellites_param.setPathVectorSatellites(pathVectorSatellites);
     } else {
         g_warning("LPE Fillet/Chamfer can only be applied to shapes (not groups).");
         SPLPEItem *item = const_cast<SPLPEItem *>(lpeItem);
@@ -256,8 +256,8 @@ void LPEFilletChamfer::updateAmount()
     } else {
         power = radius / 100;
     }
-    Satellites satellites = pointwise.getSatellites();
-    Geom::PathVector pathv = pointwise.getPathVector();
+    Satellites satellites = pathVectorSatellites.getSatellites();
+    Geom::PathVector pathv = pathVectorSatellites.getPathVector();
     for (size_t i = 0; i < satellites.size(); ++i) {
         for (size_t j = 0; j < satellites[i].size(); ++j) {
             boost::optional<size_t> previous_index = boost::none;
@@ -293,14 +293,14 @@ void LPEFilletChamfer::updateAmount()
             }
         }
     }
-    pointwise.setSatellites(satellites);
-    satellites_param.setPointwise(pointwise);
+    pathVectorSatellites.setSatellites(satellites);
+    satellites_param.setPathVectorSatellites(pathVectorSatellites);
 }
 
 void LPEFilletChamfer::updateChamferSteps()
 {
-    Satellites satellites = pointwise.getSatellites();
-    Geom::PathVector pathv = pointwise.getPathVector();
+    Satellites satellites = pathVectorSatellites.getSatellites();
+    Geom::PathVector pathv = pathVectorSatellites.getPathVector();
     for (size_t i = 0; i < satellites.size(); ++i) {
         for (size_t j = 0; j < satellites[i].size(); ++j) {
             if ((!apply_no_radius && satellites[i][j].amount == 0) ||
@@ -318,14 +318,14 @@ void LPEFilletChamfer::updateChamferSteps()
             }
         }
     }
-    pointwise.setSatellites(satellites);
-    satellites_param.setPointwise(pointwise);
+    pathVectorSatellites.setSatellites(satellites);
+    satellites_param.setPathVectorSatellites(pathVectorSatellites);
 }
 
 void LPEFilletChamfer::updateSatelliteType(SatelliteType satellitetype)
 {
-    Satellites satellites = pointwise.getSatellites();
-    Geom::PathVector pathv = pointwise.getPathVector();
+    Satellites satellites = pathVectorSatellites.getSatellites();
+    Geom::PathVector pathv = pathVectorSatellites.getPathVector();
     for (size_t i = 0; i < satellites.size(); ++i) {
         for (size_t j = 0; j < satellites[i].size(); ++j) {
             if ((!apply_no_radius && satellites[i][j].amount == 0) ||
@@ -349,8 +349,8 @@ void LPEFilletChamfer::updateSatelliteType(SatelliteType satellitetype)
             }
         }
     }
-    pointwise.setSatellites(satellites);
-    satellites_param.setPointwise(pointwise);
+    pathVectorSatellites.setSatellites(satellites);
+    satellites_param.setPathVectorSatellites(pathVectorSatellites);
 }
 
 void LPEFilletChamfer::doBeforeEffect(SPLPEItem const *lpeItem)
@@ -371,14 +371,14 @@ void LPEFilletChamfer::doBeforeEffect(SPLPEItem const *lpeItem)
         //if are diferent sizes call to poinwise recalculate
         //TODO: Update the satellite data in paths modified, Goal 0.93
         size_t number_nodes = pathv.nodes().size();
-        size_t satellites_counter = pointwise.getTotalSatellites();
+        size_t satellites_counter = pathVectorSatellites.getTotalSatellites();
         if (satellites_counter != 0 && number_nodes != satellites_counter) {
             Satellite satellite(FILLET);
             satellite.setIsTime(flexible);
             satellite.setHasMirror(mirror_knots);
             satellite.setHidden(hide_knots);
-            pointwise.recalculateForNewPathVector(pathv, satellite);
-            satellites_param.setPointwise(pointwise);
+            pathVectorSatellites.recalculateForNewPathVector(pathv, satellite);
+            satellites_param.setPathVectorSatellites(pathVectorSatellites);
             refreshKnots();
             return;
         }
@@ -416,9 +416,9 @@ void LPEFilletChamfer::doBeforeEffect(SPLPEItem const *lpeItem)
             }
         }
         
-        pointwise.setPathVector(pathv);
-        pointwise.setSatellites(satellites);
-        satellites_param.setPointwise(pointwise);
+        pathVectorSatellites.setPathVector(pathv);
+        pathVectorSatellites.setSatellites(satellites);
+        satellites_param.setPathVectorSatellites(pathVectorSatellites);
         refreshKnots();
     } else {
         g_warning("LPE Fillet can only be applied to shapes (not groups).");
@@ -454,7 +454,7 @@ LPEFilletChamfer::doEffect_path(Geom::PathVector const &path_in)
         }
         double time0 = 0;
         size_t curve = 0;
-        Satellites satellites = pointwise.getSatellites();
+        Satellites satellites = pathVectorSatellites.getSatellites();
         for (Geom::Path::const_iterator curve_it1 = path_it->begin(); curve_it1 !=  path_it->end(); ++curve_it1) {
             size_t next_index = curve + 1;
             if (curve == pathv[path].size() - 1 && pathv[path].closed()) {