![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/sp-lpe-item.cpp b/src/sp-lpe-item.cpp
index 3cb022f5bd8a80fcdaf3cf2d0d910bf4a480aaf1..f1e4c96c28bc4949299f1659c912e100cab7c677 100644 (file)
--- a/src/sp-lpe-item.cpp
+++ b/src/sp-lpe-item.cpp
#endif
#include "live_effects/effect.h"
+#include "live_effects/lpe-path_length.h"
#include "live_effects/lpeobject.h"
#include "live_effects/lpeobject-reference.h"
#include "message-stack.h"
#include "inkscape.h"
#include "desktop.h"
+#include "node-context.h"
+#include "shape-editor.h"
#include <algorithm>
lpeitem->current_path_effect = NULL;
new (&lpeitem->lpe_modified_connection) sigc::connection();
-
- lpeitem->adding_helperpaths = false;
- lpeitem->removing_helperpaths = false;
}
static void
if (((GObjectClass *) (parent_class))->finalize) {
(* ((GObjectClass *) (parent_class))->finalize)(object);
}
-
- delete SP_LPE_ITEM(object)->path_effect_list;
}
/**
@@ -154,12 +152,21 @@ sp_lpe_item_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *r
static void
sp_lpe_item_release(SPObject *object)
{
- SPLPEItem *lpeitem;
- lpeitem = (SPLPEItem *) object;
+ SPLPEItem *lpeitem = (SPLPEItem *) object;
lpeitem->lpe_modified_connection.disconnect();
lpeitem->lpe_modified_connection.~connection();
+ PathEffectList::iterator it = lpeitem->path_effect_list->begin();
+ while ( it != lpeitem->path_effect_list->end() ) {
+ // unlink and delete all references in the list
+ (*it)->unlink();
+ delete *it;
+ it = lpeitem->path_effect_list->erase(it);
+ }
+ // delete the list itself
+ delete SP_LPE_ITEM(object)->path_effect_list;
+
if (((SPObjectClass *) parent_class)->release)
((SPObjectClass *) parent_class)->release(object);
}
std::string href;
while (std::getline(iss, href, ';'))
{
- Inkscape::LivePathEffect::LPEObjectReference *path_effect_ref;
- path_effect_ref = new Inkscape::LivePathEffect::LPEObjectReference(SP_OBJECT(lpeitem));
+ Inkscape::LivePathEffect::LPEObjectReference *path_effect_ref = new Inkscape::LivePathEffect::LPEObjectReference(SP_OBJECT(lpeitem));
path_effect_ref->changedSignal().connect(sigc::bind(sigc::ptr_fun(lpeobject_ref_changed), SP_LPE_ITEM(object)));
// Now do the attaching, which emits the changed signal.
// Fixme, it should not do this changed signal and updating before all effects are added to the path_effect_list
try {
path_effect_ref->link(href.c_str());
- } catch (Inkscape::BadURIException &e) {
- g_warning("BadURIException: %s", e.what());
+ } catch (Inkscape::BadURIException e) {
+ g_warning("BadURIException when trying to find LPE: %s", e.what());
path_effect_ref->unlink();
delete path_effect_ref;
path_effect_ref = NULL;
}
- if (path_effect_ref) {
- lpeitem->path_effect_list->push_back(path_effect_ref);
+ lpeitem->path_effect_list->push_back(path_effect_ref);
+ if ( !(path_effect_ref->lpeobject && path_effect_ref->lpeobject->get_lpe()) ) {
+ // something has gone wrong in finding the right patheffect.
+ g_warning("Unknown LPE type specified, LPE stack effectively disabled");
+ // keep the effect in the lpestack, so the whole stack is effectively disabled but maintained
}
}
}
if (((SPObjectClass *) parent_class)->update) {
((SPObjectClass *) parent_class)->update(object, ctx, flags);
}
+
+ // update the helperpaths of all LPEs applied to the item
+ // TODO: is there a more canonical place for this, since we don't have instant access to the item's nodepath?
+ // FIXME: this is called multiple (at least 3) times; how can we avoid this?
+
+ // FIXME: ditch inkscape_active_event_context()
+ SPEventContext *ec = inkscape_active_event_context();
+ if (!SP_IS_NODE_CONTEXT(ec)) return;
+ ShapeEditor *sh = ec->shape_editor;
+ g_assert(sh);
+ if (!sh->has_nodepath()) return;
+
+ Inkscape::NodePath::Path *np = sh->get_nodepath();
+ sp_nodepath_update_helperpaths(np);
}
/**
static void
sp_lpe_item_modified (SPObject *object, unsigned int flags)
{
-
if (SP_IS_GROUP(object) && (flags & SP_OBJECT_MODIFIED_FLAG) && (flags & SP_OBJECT_USER_MODIFIED_FLAG_B)) {
sp_lpe_item_update_patheffect(SP_LPE_ITEM(object), true, true);
}
@@ -275,29 +297,38 @@ sp_lpe_item_write(SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::
return repr;
}
-void sp_lpe_item_perform_path_effect(SPLPEItem *lpeitem, SPCurve *curve) {
- if (!lpeitem) return;
- if (!curve) return;
+/**
+ * returns true when LPE was successful.
+ */
+bool sp_lpe_item_perform_path_effect(SPLPEItem *lpeitem, SPCurve *curve) {
+ if (!lpeitem) return false;
+ if (!curve) return false;
if (sp_lpe_item_has_path_effect(lpeitem) && sp_lpe_item_path_effects_enabled(lpeitem)) {
for (PathEffectList::iterator it = lpeitem->path_effect_list->begin(); it != lpeitem->path_effect_list->end(); ++it)
{
LivePathEffectObject *lpeobj = (*it)->lpeobject;
if (!lpeobj) {
+ /** \todo Investigate the cause of this.
+ * For example, this happens when copy pasting an object with LPE applied. Probably because the object is pasted while the effect is not yet pasted to defs, and cannot be found.
+ */
g_warning("sp_lpe_item_perform_path_effect - NULL lpeobj in list!");
- return;
+ return false;
}
- if (!lpeobj->lpe) {
- g_warning("sp_lpe_item_perform_path_effect - lpeobj without lpe!");
- return;
+ Inkscape::LivePathEffect::Effect *lpe = lpeobj->get_lpe();
+ if (!lpe) {
+ /** \todo Investigate the cause of this.
+ * Not sure, but I think this can happen when an unknown effect type is specified...
+ */
+ g_warning("sp_lpe_item_perform_path_effect - lpeobj with invalid lpe in the stack!");
+ return false;
}
- Inkscape::LivePathEffect::Effect *lpe = lpeobj->lpe;
if (lpe->isVisible()) {
- if (lpe->acceptsNumParams() > 0 && !lpe->pathParamAccepted()) {
+ if (lpe->acceptsNumClicks() > 0 && !lpe->isReady()) {
// if the effect expects mouse input before being applied and the input is not finished
// yet, we don't alter the path
- return;
+ return false;
}
// Groups have their doBeforeEffect called elsewhere
}
catch (std::exception & e) {
g_warning("Exception during LPE %s execution. \n %s", lpe->getName().c_str(), e.what());
- SP_ACTIVE_DESKTOP->messageStack()->flash( Inkscape::WARNING_MESSAGE,
- _("An exception occurred during execution of the Path Effect.") );
+ if (SP_ACTIVE_DESKTOP && SP_ACTIVE_DESKTOP->messageStack()) {
+ SP_ACTIVE_DESKTOP->messageStack()->flash( Inkscape::WARNING_MESSAGE,
+ _("An exception occurred during execution of the Path Effect.") );
+ }
+ return false;
}
}
}
}
+
+ return true;
}
/**
if (!sp_lpe_item_path_effects_enabled(lpeitem))
return;
+ // TODO: hack! this will be removed when path length measuring is reimplemented in a better way
+ PathEffectList lpelist = sp_lpe_item_get_effect_list(lpeitem);
+ std::list<Inkscape::LivePathEffect::LPEObjectReference *>::iterator i;
+ for (i = lpelist.begin(); i != lpelist.end(); ++i) {
+ if ((*i)->lpeobject) {
+ Inkscape::LivePathEffect::Effect *lpe = (*i)->lpeobject->get_lpe();
+ if (dynamic_cast<Inkscape::LivePathEffect::LPEPathLength *>(lpe)) {
+ if (!lpe->isVisible()) {
+ // we manually disable text for LPEPathLength
+ dynamic_cast<Inkscape::LivePathEffect::LPEPathLength *>(lpe)->hideCanvasText();
+ }
+ }
+ }
+ }
+
SPLPEItem *top;
if (wholetree) {
top = lpeitem;
}
- // TODO: ditch inkscape_active_desktop()
- SPDesktop *desktop = inkscape_active_desktop();
- if (desktop) {
- //sp_lpe_item_remove_temporary_canvasitems(lpeitem, desktop);
- //sp_lpe_item_add_temporary_canvasitems(lpeitem, desktop);
- }
-
if (SP_LPE_ITEM_CLASS (G_OBJECT_GET_CLASS (top))->update_patheffect) {
SP_LPE_ITEM_CLASS (G_OBJECT_GET_CLASS (top))->update_patheffect (top, write);
}
sp_lpe_item_create_original_path_recursive(lpeitem);
LivePathEffectObject *lpeobj = lpeitem->path_effect_list->back()->lpeobject;
- if (lpeobj && lpeobj->lpe) {
- Inkscape::LivePathEffect::Effect *lpe = lpeobj->lpe;
+ if (lpeobj && lpeobj->get_lpe()) {
+ Inkscape::LivePathEffect::Effect *lpe = lpeobj->get_lpe();
// Ask the path effect to reset itself if it doesn't have parameters yet
if (reset) {
// has to be called when all the subitems have their lpes applied
// perform this once when the effect is applied
lpe->doOnApply(SP_LPE_ITEM(lpeitem));
- // if the effect expects a number of mouse clicks to set a parameter path, perform the
- // necessary preparations
- if (lpe->acceptsNumParams() > 0) {
- lpe->doAcceptPathPreparations(lpeitem);
- }
+ // indicate that all necessary preparations are done and the effect can be performed
+ lpe->setReady();
}
//Enable the path effects now that everything is ready to apply the new path effect
}
}
+Inkscape::LivePathEffect::Effect*
+sp_lpe_item_has_path_effect_of_type(SPLPEItem *lpeitem, int type)
+{
+ std::list<Inkscape::LivePathEffect::LPEObjectReference *>::iterator i;
+ for (i = lpeitem->path_effect_list->begin(); i != lpeitem->path_effect_list->end(); ++i) {
+ Inkscape::LivePathEffect::Effect* lpe = (*i)->lpeobject->get_lpe();
+ if (lpe && (lpe->effectType() == type)) {
+ return lpe;
+ }
+ }
+ return NULL;
+}
+
+/* Return false if the item is not a path or already has a shape applied */
+bool sp_lpe_item_can_accept_freehand_shape(SPLPEItem *lpeitem)
+{
+ if (!SP_IS_PATH(lpeitem))
+ return false;
+
+ if (sp_lpe_item_has_path_effect_of_type(lpeitem, Inkscape::LivePathEffect::FREEHAND_SHAPE))
+ return false;
+
+ return true;
+}
+
void sp_lpe_item_edit_next_param_oncanvas(SPLPEItem *lpeitem, SPDesktop *dt)
{
Inkscape::LivePathEffect::LPEObjectReference *lperef = sp_lpe_item_get_current_lpereference(lpeitem);
- if (lperef && lperef->lpeobject && lperef->lpeobject->lpe) {
- lperef->lpeobject->lpe->editNextParamOncanvas(SP_ITEM(lpeitem), dt);
+ if (lperef && lperef->lpeobject && lperef->lpeobject->get_lpe()) {
+ lperef->lpeobject->get_lpe()->editNextParamOncanvas(SP_ITEM(lpeitem), dt);
}
}
@@ -662,7 +728,7 @@ Inkscape::LivePathEffect::Effect* sp_lpe_item_get_current_lpe(SPLPEItem *lpeitem
Inkscape::LivePathEffect::LPEObjectReference* lperef = sp_lpe_item_get_current_lpereference(lpeitem);
if (lperef && lperef->lpeobject)
- return lperef->lpeobject->lpe;
+ return lperef->lpeobject->get_lpe();
else
return NULL;
}
return lpeitem->path_effects_enabled > 0;
}
-void
-sp_lpe_item_add_temporary_canvasitems(SPLPEItem *lpeitem, SPDesktop *desktop)
-{
- if (lpeitem->adding_helperpaths) {
- return;
- }
- lpeitem->adding_helperpaths = true;
- // FIXME: for some reason it seems that we must create the variable lpe AFTER checking
- // for adding_helperpaths == true; otherwise we get a crash on startup. why??
- Inkscape::LivePathEffect::Effect *lpe = sp_lpe_item_get_current_lpe(lpeitem);
- if (lpe) {
- // TODO: can we just update the tempitem's SPCurve instead of recreating it each time?
- lpe->addHelperPaths(lpeitem, desktop);
- }
- lpeitem->adding_helperpaths = false;
-}
-
-void
-sp_lpe_item_remove_temporary_canvasitems(SPLPEItem *lpeitem, SPDesktop *desktop)
-{
- g_return_if_fail(lpeitem);
- g_return_if_fail(desktop);
-
- if (lpeitem->removing_helperpaths) {
- return;
- }
- lpeitem->removing_helperpaths = true;
-
- // destroy all temporary canvasitems created by LPEs
- std::vector<Inkscape::Display::TemporaryItem*>::iterator i;
- for (i = lpeitem->lpe_helperpaths.begin(); i != lpeitem->lpe_helperpaths.end(); ++i) {
- desktop->remove_temporary_canvasitem(*i);
- }
-
- lpeitem->removing_helperpaths = false;
-}
-
/*
Local Variables:
mode:c++