diff --git a/src/sp-path.cpp b/src/sp-path.cpp
index 51c3746c89b3dc4f6f4cfb4f76a8462b7943e5aa..04ad386d9a0fb18cf63726c96d3d9b8397452abe 100644 (file)
--- a/src/sp-path.cpp
+++ b/src/sp-path.cpp
#include <glibmm/i18n.h>
+#include "live_effects/effect.h"
+#include "live_effects/lpeobject.h"
+#include "live_effects/lpeobject-reference.h"
+#include "sp-lpe-item.h"
+
#include <display/curve.h>
#include <libnr/nr-matrix-fns.h>
#include <2geom/pathvector.h>
sp_path_description(SPItem * item)
{
int count = sp_nodes_in_path(SP_PATH(item));
- if (sp_lpe_item_has_path_effect(SP_LPE_ITEM(item))) {
- return g_strdup_printf(ngettext("<b>Path</b> (%i node, path effect)",
- "<b>Path</b> (%i nodes, path effect)",count), count);
+ if (SP_IS_LPE_ITEM(item) && sp_lpe_item_has_path_effect(SP_LPE_ITEM(item))) {
+
+ Glib::ustring s;
+
+ PathEffectList effect_list = sp_lpe_item_get_effect_list(SP_LPE_ITEM(item));
+ for (PathEffectList::iterator it = effect_list.begin(); it != effect_list.end(); it++)
+ {
+ LivePathEffectObject *lpeobj = (*it)->lpeobject;
+ if (!lpeobj || !lpeobj->get_lpe())
+ break;
+ if (s.empty())
+ s = lpeobj->get_lpe()->getName();
+ else
+ s = s + ", " + lpeobj->get_lpe()->getName();
+ }
+
+ return g_strdup_printf(ngettext("<b>Path</b> (%i node, path effect: %s)",
+ "<b>Path</b> (%i nodes, path effect: %s)",count), count, s.c_str());
} else {
return g_strdup_printf(ngettext("<b>Path</b> (%i node)",
"<b>Path</b> (%i nodes)",count), count);
object->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
break;
case SP_ATTR_D:
- if (!sp_lpe_item_has_path_effect_recursive(SP_LPE_ITEM(path))) {
if (value) {
Geom::PathVector pv = sp_svg_read_pathv(value);
SPCurve *curve = new SPCurve(pv);
sp_shape_set_curve((SPShape *) path, NULL, TRUE);
}
object->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
- }
break;
case SP_PROP_MARKER:
case SP_PROP_MARKER_START:
return Geom::identity();
}
- // Transform the original-d path or the (ordinary) path
- if (path->original_curve) {
+ // Transform the original-d path if this is a valid LPE item, other else the (ordinary) path
+ if (path->original_curve && SP_IS_LPE_ITEM(item) &&
+ sp_lpe_item_has_path_effect(SP_LPE_ITEM(item))) {
path->original_curve->transform(xform);
} else {
shape->curve->transform(xform);
SPPath * const path = (SPPath *) lpeitem;
Inkscape::XML::Node *repr = SP_OBJECT_REPR(shape);
- if (path->original_curve) {
+ if (path->original_curve && sp_lpe_item_has_path_effect_recursive(lpeitem)) {
SPCurve *curve = path->original_curve->copy();
/* if a path does not have an lpeitem applied, then reset the curve to the original_curve.
* This is very important for LPEs to work properly! (the bbox might be recalculated depending on the curve in shape)*/
SPCurve*
sp_path_get_curve_for_edit (SPPath *path)
{
- if (path->original_curve) {
+ if (path->original_curve && SP_IS_LPE_ITEM(path) &&
+ sp_lpe_item_has_path_effect(SP_LPE_ITEM(path))) {
return sp_path_get_original_curve(path);
} else {
return sp_shape_get_curve( (SPShape *) path );
const SPCurve*
sp_path_get_curve_reference (SPPath *path)
{
- if (path->original_curve) {
+ if (path->original_curve && SP_IS_LPE_ITEM(path) &&
+ sp_lpe_item_has_path_effect(SP_LPE_ITEM(path))) {
return path->original_curve;
} else {
return path->curve;