summaryrefslogtreecommitdiffstats
path: root/src/live_effects
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2015-03-19 23:14:47 +0000
committerJabiertxof <jtx@jtx.marker.es>2015-03-19 23:14:47 +0000
commitf3e7b51b1d2497cda7a66e13f4f50da145ece19c (patch)
tree21b2586ac55dca8bee4ca0bc6ed4cef050ae51fc /src/live_effects
parentupdate to trunk (diff)
downloadinkscape-f3e7b51b1d2497cda7a66e13f4f50da145ece19c.tar.gz
inkscape-f3e7b51b1d2497cda7a66e13f4f50da145ece19c.zip
Added delete nodes/satellites
(bzr r13645.1.45)
Diffstat (limited to 'src/live_effects')
-rw-r--r--src/live_effects/lpe-fillet-chamfer.cpp7
-rw-r--r--src/live_effects/parameter/array.h2
2 files changed, 1 insertions, 8 deletions
diff --git a/src/live_effects/lpe-fillet-chamfer.cpp b/src/live_effects/lpe-fillet-chamfer.cpp
index 0a5d3a224..38645a943 100644
--- a/src/live_effects/lpe-fillet-chamfer.cpp
+++ b/src/live_effects/lpe-fillet-chamfer.cpp
@@ -119,7 +119,7 @@ void LPEFilletChamfer::doOnApply(SPLPEItem const *lpeItem)
Geom::Path::const_iterator curve_end = curve_endit;
--curve_end;
int counter = 0;
- unsigned int steps = 0;
+ unsigned int steps = chamfer_steps;
while (curve_it1 != curve_endit) {
if((*curve_it1).isDegenerate() || (*curve_it1).isDegenerate()){
g_warning("LPE Fillet not handle degenerate curves.");
@@ -354,7 +354,6 @@ void LPEFilletChamfer::updateSatelliteType(Geom::SatelliteType satellitetype)
void LPEFilletChamfer::doBeforeEffect(SPLPEItem const *lpeItem)
{
- std::cout << "dobeforestart\n";
SPLPEItem * splpeitem = const_cast<SPLPEItem *>(lpeItem);
SPShape * shape = dynamic_cast<SPShape *>(splpeitem);
if (shape) {
@@ -422,7 +421,6 @@ void LPEFilletChamfer::doBeforeEffect(SPLPEItem const *lpeItem)
} else {
g_warning("LPE Fillet can only be applied to shapes (not groups).");
}
- std::cout << "dobeforeend\n";
}
void
@@ -430,7 +428,6 @@ LPEFilletChamfer::adjustForNewPath(std::vector<Geom::Path> const &path_in)
{
if (!path_in.empty() && pointwise) {
pointwise->recalculate_for_new_pwd2(paths_to_pw(pathv_to_linear_and_cubic_beziers(path_in)));
- pointwise->set_extremes(false,true,0.0,0.0);
satellitepairarrayparam_values.set_pointwise(pointwise);
}
}
@@ -438,7 +435,6 @@ LPEFilletChamfer::adjustForNewPath(std::vector<Geom::Path> const &path_in)
std::vector<Geom::Path>
LPEFilletChamfer::doEffect_path(std::vector<Geom::Path> const &path_in)
{
- std::cout << "doEffect_pathstart\n";
const double gapHelper = 0.00001;
std::vector<Geom::Path> pathvector_out;
unsigned int counter = 0;
@@ -677,7 +673,6 @@ LPEFilletChamfer::doEffect_path(std::vector<Geom::Path> const &path_in)
}
pathvector_out.push_back(path_out);
}
- std::cout << "doEffect_pathendt\n";
return pathvector_out;
}
diff --git a/src/live_effects/parameter/array.h b/src/live_effects/parameter/array.h
index 5443cc3c4..7ff477ffb 100644
--- a/src/live_effects/parameter/array.h
+++ b/src/live_effects/parameter/array.h
@@ -17,7 +17,6 @@
#include <2geom/satellite.h>
#include <2geom/satellite-enum.h>
-#include <2geom/pointwise.h>
#include "svg/svg.h"
#include "svg/stringstream.h"
@@ -132,7 +131,6 @@ protected:
str << nVector.second.getAngle();
str << "*";
str << nVector.second.getSteps();
- std::cout << str.str() << "SATEEELIITE\n";
}
StorageType readsvg(const gchar * str);