summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2015-03-28 12:49:37 +0000
committerJabiertxof <jtx@jtx.marker.es>2015-03-28 12:49:37 +0000
commit13df14f4cf6b48cf01ac54ba0322f50a143c007e (patch)
treea77aba0772bbc2f2200c76cb6b2603fcf208a55d /src
parentadding append mode (diff)
downloadinkscape-13df14f4cf6b48cf01ac54ba0322f50a143c007e.tar.gz
inkscape-13df14f4cf6b48cf01ac54ba0322f50a143c007e.zip
adding append mode
(bzr r13645.1.55)
Diffstat (limited to 'src')
-rw-r--r--src/live_effects/lpe-fillet-chamfer.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/live_effects/lpe-fillet-chamfer.cpp b/src/live_effects/lpe-fillet-chamfer.cpp
index 55e1f93aa..2fc2027ab 100644
--- a/src/live_effects/lpe-fillet-chamfer.cpp
+++ b/src/live_effects/lpe-fillet-chamfer.cpp
@@ -372,7 +372,6 @@ void LPEFilletChamfer::doBeforeEffect(SPLPEItem const *lpeItem)
Piecewise<D2<SBasis> > pwd2_in = paths_to_pw(original_pathv);
pwd2_in = remove_short_cuts(pwd2_in, 0.01);
std::vector<std::pair<size_t,Geom::Satellite> > sats = satellitepairarrayparam_values.data();
-
//optional call
if(hide_knots){
satellitepairarrayparam_values.set_helper_size(0);
@@ -413,6 +412,11 @@ void LPEFilletChamfer::doBeforeEffect(SPLPEItem const *lpeItem)
if(refresh){
refreshKnots();
}
+ if(c->nodes_in_path() != sats.size()){
+ pointwise->recalculate_for_new_pwd2(pwd2_in);
+ pointwise->set_extremes(true, false, true, 0.0, 0.0);
+ satellitepairarrayparam_values.set_pointwise(pointwise);
+ }
} else {
g_warning("LPE Fillet can only be applied to shapes (not groups).");
}
@@ -421,9 +425,7 @@ void LPEFilletChamfer::doBeforeEffect(SPLPEItem const *lpeItem)
void
LPEFilletChamfer::adjustForNewPath(std::vector<Geom::Path> const &path_in)
{
- std::cout << "1111111111111111111111111111111111111111\n";
if (!path_in.empty() && pointwise) {
- std::cout << "222222222222222222222222222222222222222222222\n";
pointwise->recalculate_for_new_pwd2(pathv_to_linear_and_cubic_beziers(path_in)[0].toPwSb());
pointwise->set_extremes(true, false, true, 0.0, 0.0);
satellitepairarrayparam_values.set_pointwise(pointwise);