summaryrefslogtreecommitdiffstats
path: root/src/live_effects
diff options
context:
space:
mode:
Diffstat (limited to 'src/live_effects')
-rw-r--r--src/live_effects/lpe-fillet-chamfer.cpp10
-rw-r--r--src/live_effects/parameter/array.cpp8
-rw-r--r--src/live_effects/parameter/array.h8
3 files changed, 9 insertions, 17 deletions
diff --git a/src/live_effects/lpe-fillet-chamfer.cpp b/src/live_effects/lpe-fillet-chamfer.cpp
index 2354aa5ed..39acdca80 100644
--- a/src/live_effects/lpe-fillet-chamfer.cpp
+++ b/src/live_effects/lpe-fillet-chamfer.cpp
@@ -16,6 +16,7 @@
#include "live_effects/lpe-fillet-chamfer.h"
+#include "live_effects/lpeobject.h"
#include <sp-shape.h>
#include <sp-path.h>
#include <2geom/pointwise.h>
@@ -120,15 +121,6 @@ void LPEFilletChamfer::doOnApply(SPLPEItem const *lpeItem)
void LPEFilletChamfer::doBeforeEffect(SPLPEItem const *lpeItem)
{
SPLPEItem * splpeitem = const_cast<SPLPEItem *>(lpeItem);
- if (splpeitem) {
- // This writes all parameters to SVG. Is this sufficiently efficient or should we only
- // write the ones that were changed?
- Inkscape::LivePathEffect::Effect *lpe = splpeitem->getCurrentLPE();
- if (lpe) {
- LivePathEffectObject *lpeobj = lpe->getLPEObj();
- lpeobj->updateRepr();
- }
- }
SPShape * shape = dynamic_cast<SPShape *>(splpeitem);
if (shape) {
SPCurve *c = shape->getCurve();
diff --git a/src/live_effects/parameter/array.cpp b/src/live_effects/parameter/array.cpp
index 473b561d2..6dad9fcc8 100644
--- a/src/live_effects/parameter/array.cpp
+++ b/src/live_effects/parameter/array.cpp
@@ -56,10 +56,10 @@ sp_svg_satellite_read_d(gchar const *str, Geom::Satellite *sat){
gchar ** strarray = g_strsplit(str, "*", 0);
if(strarray[6] && !strarray[7]){
sat->setSatelliteType(strarray[0]);
- sat->setIsTime(helperfns_read_bool(strarray[1], true));
- sat->setActive(helperfns_read_bool(strarray[2], true));
- sat->setHasMirror(helperfns_read_bool(strarray[3], false));
- sat->setHidden(helperfns_read_bool(strarray[4], false));
+ sat->setIsTime(strncmp(strarray[1],"1",1) == 0);
+ sat->setActive(strncmp(strarray[2],"1",1) == 0);
+ sat->setHasMirror(strncmp(strarray[3],"1",1) == 0);
+ sat->setHidden(strncmp(strarray[4],"1",1) == 0);
double time,size;
sp_svg_number_read_d(strarray[5], &size);
sp_svg_number_read_d(strarray[6], &time);
diff --git a/src/live_effects/parameter/array.h b/src/live_effects/parameter/array.h
index e9775da24..ff406d792 100644
--- a/src/live_effects/parameter/array.h
+++ b/src/live_effects/parameter/array.h
@@ -117,13 +117,13 @@ protected:
str << ",";
str << nVector.second.getSatelliteTypeGchar();
str << "*";
- str << g_strdup(nVector.second.getIsTime() ? "true" : "false");
+ str << nVector.second.getIsTime();
str << "*";
- str << g_strdup(nVector.second.getActive() ? "true" : "false");
+ str << nVector.second.getActive();
str << "*";
- str << g_strdup(nVector.second.getHasMirror() ? "true" : "false");
+ str << nVector.second.getHasMirror();
str << "*";
- str << g_strdup(nVector.second.getHidden() ? "true" : "false");
+ str << nVector.second.getHidden();
str << "*";
str << nVector.second.getSize();
str << "*";