From a6fa3b454bdcef9b23e0a3107b6de6b4c6a477a0 Mon Sep 17 00:00:00 2001 From: johnce Date: Wed, 5 Aug 2009 05:56:35 +0000 Subject: SPDocument->Document (bzr r8405) --- src/live_effects/effect.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/live_effects/effect.cpp') diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index de0535448..f92f7c2ab 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -246,7 +246,7 @@ Effect::New(EffectType lpenr, LivePathEffectObject *lpeobj) } void -Effect::createAndApply(const char* name, SPDocument *doc, SPItem *item) +Effect::createAndApply(const char* name, Document *doc, SPItem *item) { // Path effect definition Inkscape::XML::Document *xml_doc = sp_document_repr_doc(doc); @@ -263,7 +263,7 @@ Effect::createAndApply(const char* name, SPDocument *doc, SPItem *item) } void -Effect::createAndApply(EffectType type, SPDocument *doc, SPItem *item) +Effect::createAndApply(EffectType type, Document *doc, SPItem *item) { createAndApply(LPETypeConverter.get_key(type).c_str(), doc, item); } @@ -576,7 +576,7 @@ Effect::getRepr() return SP_OBJECT_REPR(lpeobj); } -SPDocument * +Document * Effect::getSPDoc() { if (SP_OBJECT_DOCUMENT(lpeobj) == NULL) g_message("Effect::getSPDoc() returns NULL"); -- cgit v1.2.3 From 51c2905fd3e99955db2d823b79abb763d8097028 Mon Sep 17 00:00:00 2001 From: Maximilian Albert Date: Thu, 6 Aug 2009 14:17:17 +0000 Subject: Revert recent refactoring changes by johnce because they break the build, which cannot be fixed easily. (bzr r8422) --- src/live_effects/effect.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/live_effects/effect.cpp') diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index f92f7c2ab..de0535448 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -246,7 +246,7 @@ Effect::New(EffectType lpenr, LivePathEffectObject *lpeobj) } void -Effect::createAndApply(const char* name, Document *doc, SPItem *item) +Effect::createAndApply(const char* name, SPDocument *doc, SPItem *item) { // Path effect definition Inkscape::XML::Document *xml_doc = sp_document_repr_doc(doc); @@ -263,7 +263,7 @@ Effect::createAndApply(const char* name, Document *doc, SPItem *item) } void -Effect::createAndApply(EffectType type, Document *doc, SPItem *item) +Effect::createAndApply(EffectType type, SPDocument *doc, SPItem *item) { createAndApply(LPETypeConverter.get_key(type).c_str(), doc, item); } @@ -576,7 +576,7 @@ Effect::getRepr() return SP_OBJECT_REPR(lpeobj); } -Document * +SPDocument * Effect::getSPDoc() { if (SP_OBJECT_DOCUMENT(lpeobj) == NULL) g_message("Effect::getSPDoc() returns NULL"); -- cgit v1.2.3 From a296952996a95299ccb4963479237b5bb86acda6 Mon Sep 17 00:00:00 2001 From: Josh Andler Date: Sat, 26 Sep 2009 20:40:26 +0000 Subject: Other patch by Johan to comment out a warning. Thanks Johan! (bzr r8652) --- src/live_effects/effect.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/live_effects/effect.cpp') diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index de0535448..1d001b31a 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -505,7 +505,7 @@ Effect::getHelperPaths(SPLPEItem *lpeitem) std::vector hp_vec; if (!SP_IS_SHAPE(lpeitem)) { - g_print ("How to handle helperpaths for non-shapes?\n"); // non-shapes are for example SPGroups. +// g_print ("How to handle helperpaths for non-shapes?\n"); // non-shapes are for example SPGroups. return hp_vec; } -- cgit v1.2.3 From 8c1bebebcb819658b21ee33419361f991ad08da2 Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" Date: Mon, 23 Nov 2009 20:36:50 +0000 Subject: add LPE extrude. it's not finished yet! (bzr r8838) --- src/live_effects/effect.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/live_effects/effect.cpp') diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index 1d001b31a..04549622e 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -74,6 +74,7 @@ #include "live_effects/lpe-path_length.h" #include "live_effects/lpe-line_segment.h" #include "live_effects/lpe-recursiveskeleton.h" +#include "live_effects/lpe-extrude.h" namespace Inkscape { @@ -90,6 +91,7 @@ const Util::EnumData LPETypeData[] = { {CIRCLE_WITH_RADIUS, N_("Circle (by center and radius)"), "circle_with_radius"}, {CIRCLE_3PTS, N_("Circle by 3 points"), "circle_3pts"}, {DYNASTROKE, N_("Dynamic stroke"), "dynastroke"}, + {EXTRUDE, N_("Extrude"), "extrude"}, {LATTICE, N_("Lattice Deformation"), "lattice"}, {LINE_SEGMENT, N_("Line Segment"), "line_segment"}, {MIRROR_SYMMETRY, N_("Mirror symmetry"), "mirror_symmetry"}, @@ -232,6 +234,9 @@ Effect::New(EffectType lpenr, LivePathEffectObject *lpeobj) case RECURSIVE_SKELETON: neweffect = static_cast ( new LPERecursiveSkeleton(lpeobj) ); break; + case EXTRUDE: + neweffect = static_cast ( new LPEExtrude(lpeobj) ); + break; default: g_warning("LivePathEffect::Effect::New called with invalid patheffect type (%d)", lpenr); neweffect = NULL; -- cgit v1.2.3 From 65fd3f75497e45a96737b1e1b5da8ac34353405d Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" Date: Mon, 23 Nov 2009 21:24:51 +0000 Subject: decrease header deps (bzr r8842) --- src/live_effects/effect.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/live_effects/effect.cpp') diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index 04549622e..9232792f6 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -29,6 +29,7 @@ #include "message-stack.h" #include "desktop.h" #include "nodepath.h" +#include "knotholder.h" #include "live_effects/lpeobject.h" #include "live_effects/parameter/parameter.h" -- cgit v1.2.3