![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/sp-path.cpp b/src/sp-path.cpp
index 2e8cc2f7534c4f46a72f51453cb5a5676888b902..54d2a201a1480225c438fb778d5ca44d71baa7a1 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/n-art-bpath.h>
-#include <libnr/nr-path.h>
#include <libnr/nr-matrix-fns.h>
+#include <2geom/pathvector.h>
+#include <2geom/bezier-curve.h>
+#include <2geom/hvlinesegment.h>
+#include "helper/geom-curves.h"
#include "svg/svg.h"
#include "xml/repr.h"
#include "attributes.h"
#include "sp-path.h"
+#include "sp-guide.h"
+
+#include "document.h"
+#include "desktop.h"
+#include "desktop-handles.h"
+#include "desktop-style.h"
+#include "event-context.h"
+#include "inkscape.h"
+#include "style.h"
+#include "message-stack.h"
+#include "selection.h"
#define noPATH_VERBOSE
static void sp_path_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
static void sp_path_set(SPObject *object, unsigned key, gchar const *value);
-static Inkscape::XML::Node *sp_path_write(SPObject *object, Inkscape::XML::Node *repr, guint flags);
-static NR::Matrix sp_path_set_transform(SPItem *item, NR::Matrix const &xform);
+static Inkscape::XML::Node *sp_path_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
+static Geom::Matrix sp_path_set_transform(SPItem *item, Geom::Matrix const &xform);
static gchar * sp_path_description(SPItem *item);
+static void sp_path_convert_to_guides(SPItem *item);
static void sp_path_update(SPObject *object, SPCtx *ctx, guint flags);
+static void sp_path_update_patheffect(SPLPEItem *lpeitem, bool write);
static SPShapeClass *parent_class;
GObjectClass *gobject_class = (GObjectClass *) klass;
SPObjectClass *sp_object_class = (SPObjectClass *) klass;
SPItemClass *item_class = (SPItemClass *) klass;
+ SPLPEItemClass *lpe_item_class = (SPLPEItemClass *) klass;
parent_class = (SPShapeClass *)g_type_class_peek_parent(klass);
item_class->description = sp_path_description;
item_class->set_transform = sp_path_set_transform;
+ item_class->convert_to_guides = sp_path_convert_to_guides;
+
+ lpe_item_class->update_patheffect = sp_path_update_patheffect;
}
sp_nodes_in_path(SPPath *path)
{
SPCurve *curve = SP_SHAPE(path)->curve;
- if (!curve) return 0;
- gint r = curve->end;
- gint i = curve->length - 1;
- if (i > r) i = r; // sometimes after switching from node editor length is wrong, e.g. f6 - draw - f2 - tab - f1, this fixes it
- for (; i >= 0; i --)
- if (SP_CURVE_BPATH(curve)[i].code == NR_MOVETO)
- r --;
- return r;
+ if (!curve)
+ return 0;
+ return curve->nodes_in_path();
}
static gchar *
sp_path_description(SPItem * item)
{
int count = sp_nodes_in_path(SP_PATH(item));
- return g_strdup_printf(ngettext("<b>Path</b> (%i node)",
- "<b>Path</b> (%i nodes)",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);
+ }
+}
+
+static void
+sp_path_convert_to_guides(SPItem *item)
+{
+ SPPath *path = SP_PATH(item);
+
+ SPCurve *curve = SP_SHAPE(path)->curve;
+ if (!curve) return;
+
+ std::list<std::pair<Geom::Point, Geom::Point> > pts;
+
+ Geom::Matrix const i2d (sp_item_i2d_affine(SP_ITEM(path)));
+
+ Geom::PathVector const & pv = curve->get_pathvector();
+ for(Geom::PathVector::const_iterator pit = pv.begin(); pit != pv.end(); ++pit) {
+ for(Geom::Path::const_iterator cit = pit->begin(); cit != pit->end_default(); ++cit) {
+ // only add curves for straight line segments
+ if( is_straight_curve(*cit) )
+ {
+ pts.push_back(std::make_pair(cit->initialPoint() * i2d, cit->finalPoint() * i2d));
+ }
+ }
+ }
+
+ sp_guide_pt_pairs_to_guides(inkscape_active_desktop(), pts);
}
/**
- * Initializes an SPPath. Currently does nothing.
+ * Initializes an SPPath.
*/
static void
sp_path_init(SPPath *path)
{
new (&path->connEndPair) SPConnEndPair(path);
+
+ path->original_curve = NULL;
}
static void
static void
sp_path_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
{
- sp_object_read_attr(object, "d");
-
- /* d is a required attribute */
- gchar const *d = sp_object_getAttribute(object, "d", NULL);
- if (d == NULL) {
- sp_object_set(object, sp_attribute_lookup("d"), "");
- }
-
/* Are these calls actually necessary? */
sp_object_read_attr(object, "marker");
sp_object_read_attr(object, "marker-start");
@@ -165,6 +224,15 @@ sp_path_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
if (((SPObjectClass *) parent_class)->build) {
((SPObjectClass *) parent_class)->build(object, document, repr);
}
+
+ sp_object_read_attr(object, "inkscape:original-d");
+ sp_object_read_attr(object, "d");
+
+ /* d is a required attribute */
+ gchar const *d = sp_object_getAttribute(object, "d", NULL);
+ if (d == NULL) {
+ sp_object_set(object, sp_attribute_lookup("d"), "");
+ }
}
static void
path->connEndPair.release();
+ if (path->original_curve) {
+ path->original_curve = path->original_curve->unref();
+ }
+
if (((SPObjectClass *) parent_class)->release) {
((SPObjectClass *) parent_class)->release(object);
}
SPPath *path = (SPPath *) object;
switch (key) {
- case SP_ATTR_D:
- if (value) {
- NArtBpath *bpath = sp_svg_read_path(value);
- SPCurve *curve = sp_curve_new_from_bpath(bpath);
- if (curve) {
- sp_shape_set_curve((SPShape *) path, curve, TRUE);
- sp_curve_unref(curve);
+ case SP_ATTR_INKSCAPE_ORIGINAL_D:
+ if (value) {
+ Geom::PathVector pv = sp_svg_read_pathv(value);
+ SPCurve *curve = new SPCurve(pv);
+ if (curve) {
+ sp_path_set_original_curve(path, curve, TRUE, true);
+ curve->unref();
+ }
+ } else {
+ sp_path_set_original_curve(path, NULL, TRUE, true);
}
- } else {
- sp_shape_set_curve((SPShape *) path, NULL, TRUE);
- }
- object->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+ object->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+ break;
+ case SP_ATTR_D:
+ if (value) {
+ Geom::PathVector pv = sp_svg_read_pathv(value);
+ SPCurve *curve = new SPCurve(pv);
+ if (curve) {
+ sp_shape_set_curve((SPShape *) path, curve, TRUE);
+ curve->unref();
+ }
+ } else {
+ sp_shape_set_curve((SPShape *) path, NULL, TRUE);
+ }
+ object->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
break;
case SP_PROP_MARKER:
case SP_PROP_MARKER_START:
object->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
break;
case SP_ATTR_CONNECTOR_TYPE:
+ case SP_ATTR_CONNECTOR_CURVATURE:
case SP_ATTR_CONNECTION_START:
case SP_ATTR_CONNECTION_END:
+ case SP_ATTR_CONNECTION_START_POINT:
+ case SP_ATTR_CONNECTION_END_POINT:
path->connEndPair.setAttr(key, value);
break;
default:
* Writes the path object into a Inkscape::XML::Node
*/
static Inkscape::XML::Node *
-sp_path_write(SPObject *object, Inkscape::XML::Node *repr, guint flags)
+sp_path_write(SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags)
{
SPShape *shape = (SPShape *) object;
if ((flags & SP_OBJECT_WRITE_BUILD) && !repr) {
- repr = sp_repr_new("svg:path");
+ repr = xml_doc->createElement("svg:path");
}
+#ifdef PATH_VERBOSE
+g_message("sp_path_write writes 'd' attribute");
+#endif
if ( shape->curve != NULL ) {
- NArtBpath *abp = sp_curve_first_bpath(shape->curve);
- if (abp) {
- gchar *str = sp_svg_write_path(abp);
- repr->setAttribute("d", str);
+ gchar *str = sp_svg_write_path(shape->curve->get_pathvector());
+ repr->setAttribute("d", str);
+ g_free(str);
+ } else {
+ repr->setAttribute("d", NULL);
+ }
+
+ if (flags & SP_OBJECT_WRITE_EXT) {
+ SPPath *path = (SPPath *) object;
+ if ( path->original_curve != NULL ) {
+ gchar *str = sp_svg_write_path(path->original_curve->get_pathvector());
+ repr->setAttribute("inkscape:original-d", str);
g_free(str);
} else {
- repr->setAttribute("d", "");
+ repr->setAttribute("inkscape:original-d", NULL);
}
- } else {
- repr->setAttribute("d", NULL);
}
SP_PATH(shape)->connEndPair.writeRepr(repr);
if (((SPObjectClass *)(parent_class))->write) {
- ((SPObjectClass *)(parent_class))->write(object, repr, flags);
+ ((SPObjectClass *)(parent_class))->write(object, xml_doc, repr, flags);
}
return repr;
/**
* Writes the given transform into the repr for the given item.
*/
-static NR::Matrix
-sp_path_set_transform(SPItem *item, NR::Matrix const &xform)
+static Geom::Matrix
+sp_path_set_transform(SPItem *item, Geom::Matrix const &xform)
{
SPShape *shape = (SPShape *) item;
+ SPPath *path = (SPPath *) item;
if (!shape->curve) { // 0 nodes, nothing to transform
- return NR::identity();
+ return Geom::identity();
}
- /* Transform the path */
- NRBPath dpath, spath;
- spath.path = SP_CURVE_BPATH(shape->curve);
- nr_path_duplicate_transform(&dpath, &spath, xform);
- SPCurve *curve = sp_curve_new_from_bpath(dpath.path);
- if (curve) {
- sp_shape_set_curve(shape, curve, TRUE);
- sp_curve_unref(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_recursive(SP_LPE_ITEM(item))) {
+ path->original_curve->transform(xform);
+ } else {
+ shape->curve->transform(xform);
}
// Adjust stroke
- sp_item_adjust_stroke(item, NR::expansion(xform));
+ sp_item_adjust_stroke(item, xform.descrim());
// Adjust pattern fill
sp_item_adjust_pattern(item, xform);
// Adjust gradient fill
sp_item_adjust_gradient(item, xform);
+ // Adjust LPE
+ sp_item_adjust_livepatheffect(item, xform);
+
item->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG);
// nothing remains - we've written all of the transform, so return identity
- return NR::identity();
+ return Geom::identity();
}
+static void
+sp_path_update_patheffect(SPLPEItem *lpeitem, bool write)
+{
+ SPShape * const shape = (SPShape *) lpeitem;
+ SPPath * const path = (SPPath *) lpeitem;
+ Inkscape::XML::Node *repr = SP_OBJECT_REPR(shape);
+
+#ifdef PATH_VERBOSE
+g_message("sp_path_update_patheffect");
+#endif
+
+ 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)*/
+ sp_shape_set_curve_insync(shape, curve, TRUE);
+
+ bool success = sp_lpe_item_perform_path_effect(SP_LPE_ITEM(shape), curve);
+ if (success && write) {
+ // could also do SP_OBJECT(shape)->updateRepr(); but only the d attribute needs updating.
+#ifdef PATH_VERBOSE
+g_message("sp_path_update_patheffect writes 'd' attribute");
+#endif
+ if ( shape->curve != NULL ) {
+ gchar *str = sp_svg_write_path(shape->curve->get_pathvector());
+ repr->setAttribute("d", str);
+ g_free(str);
+ } else {
+ repr->setAttribute("d", NULL);
+ }
+ } else if (!success) {
+ // LPE was unsuccesfull. Read the old 'd'-attribute.
+ if (gchar const * value = repr->attribute("d")) {
+ Geom::PathVector pv = sp_svg_read_pathv(value);
+ SPCurve *oldcurve = new SPCurve(pv);
+ if (oldcurve) {
+ sp_shape_set_curve(shape, oldcurve, TRUE);
+ oldcurve->unref();
+ }
+ }
+ }
+ SP_OBJECT(shape)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+ curve->unref();
+ }
+}
+
+
+/**
+ * Adds a original_curve to the path. If owner is specified, a reference
+ * will be made, otherwise the curve will be copied into the path.
+ * Any existing curve in the path will be unreferenced first.
+ * This routine triggers reapplication of an effect if present
+ * and also triggers a request to update the display. Does not write
+ * result to XML when write=false.
+ */
+void
+sp_path_set_original_curve (SPPath *path, SPCurve *curve, unsigned int owner, bool write)
+{
+ if (path->original_curve) {
+ path->original_curve = path->original_curve->unref();
+ }
+ if (curve) {
+ if (owner) {
+ path->original_curve = curve->ref();
+ } else {
+ path->original_curve = curve->copy();
+ }
+ }
+ sp_lpe_item_update_patheffect(path, true, write);
+ SP_OBJECT(path)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+}
+
+/**
+ * Return duplicate of original_curve (if any exists) or NULL if there is no curve
+ */
+SPCurve *
+sp_path_get_original_curve (SPPath *path)
+{
+ if (path->original_curve) {
+ return path->original_curve->copy();
+ }
+ return NULL;
+}
+
+/**
+ * Return duplicate of edittable curve which is original_curve if it exists or
+ * shape->curve if not.
+ */
+SPCurve*
+sp_path_get_curve_for_edit (SPPath *path)
+{
+ if (path->original_curve && SP_IS_LPE_ITEM(path) &&
+ sp_lpe_item_has_path_effect_recursive(SP_LPE_ITEM(path))) {
+ return sp_path_get_original_curve(path);
+ } else {
+ return sp_shape_get_curve( (SPShape *) path );
+ }
+}
+
+/**
+ * Return a reference to original_curve if it exists or
+ * shape->curve if not.
+ */
+const SPCurve*
+sp_path_get_curve_reference (SPPath *path)
+{
+ if (path->original_curve && SP_IS_LPE_ITEM(path) &&
+ sp_lpe_item_has_path_effect_recursive(SP_LPE_ITEM(path))) {
+ return path->original_curve;
+ } else {
+ return path->curve;
+ }
+}
+
/*
Local Variables:
mode:c++