![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/sp-path.cpp b/src/sp-path.cpp
index 9fe2f54c56a216b440a98a4ab55caaa88e7a925a..20515c4cd7c7c52f49fc567b9f2d02264870e8aa 100644 (file)
--- a/src/sp-path.cpp
+++ b/src/sp-path.cpp
# include <config.h>
#endif
-#if defined(WIN32) || defined(__APPLE__)
-# include <glibmm/i18n.h>
-#endif
+#include <glibmm/i18n.h>
#include <display/curve.h>
#include <libnr/n-art-bpath.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 "prefs-utils.h"
+#include "selection.h"
#define noPATH_VERBOSE
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 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;
}
{
SPCurve *curve = SP_SHAPE(path)->curve;
if (!curve) return 0;
- gint r = curve->end;
- gint i = curve->length - 1;
+ 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 ((curve->bpath + i) -> code == NR_MOVETO)
+ if (SP_CURVE_BPATH(curve)[i].code == NR_MOVETO)
r --;
return r;
}
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_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);
+ } 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);
+
+ SPDocument *doc = SP_OBJECT_DOCUMENT(path);
+ std::list<std::pair<Geom::Point, Geom::Point> > pts;
+
+ NR::Matrix const i2d (sp_item_i2d_affine(SP_ITEM(path)));
+
+ SPCurve *curve = SP_SHAPE(path)->curve;
+ if (!curve) return;
+ NArtBpath const *bpath = SP_CURVE_BPATH(curve);
+
+ NR::Point last_pt;
+ NR::Point pt;
+ for (int i = 0; bpath[i].code != NR_END; i++){
+ if (bpath[i].code == NR_LINETO) {
+ /* we only convert straight line segments (converting curve segments would be unintuitive) */
+ pt = bpath[i].c(3) * i2d;
+ pts.push_back(std::make_pair(last_pt.to_2geom(), pt.to_2geom()));
+ }
+
+ /* remember current point for potential reuse in the next step
+ (e.g., in case this was an NR_MOVETO or NR_MOVETO_OPEN) */
+ last_pt = bpath[i].c(3) * i2d;
+ }
+
+ sp_guide_pt_pairs_to_guides(doc, 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");
@@ -167,6 +213,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) {
+ NArtBpath *bpath = sp_svg_read_path(value);
+ SPCurve *curve = SPCurve::new_from_bpath(bpath);
+ 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);
+ break;
+ case SP_ATTR_D:
+ if (!sp_lpe_item_has_path_effect_recursive(SP_LPE_ITEM(path))) {
+ if (value) {
+ NArtBpath *bpath = sp_svg_read_path(value);
+ SPCurve *curve = SPCurve::new_from_bpath(bpath);
+ 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);
}
- object->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
break;
case SP_PROP_MARKER:
case SP_PROP_MARKER_START:
SPShape *shape = (SPShape *) object;
if ((flags & SP_OBJECT_WRITE_BUILD) && !repr) {
- repr = sp_repr_new("svg:path");
+ Inkscape::XML::Document *xml_doc = sp_document_repr_doc(SP_OBJECT_DOCUMENT(object));
+ repr = xml_doc->createElement("svg:path");
}
if ( shape->curve != NULL ) {
- NArtBpath *abp = sp_curve_first_bpath(shape->curve);
+ NArtBpath *abp = shape->curve->first_bpath();
if (abp) {
gchar *str = sp_svg_write_path(abp);
repr->setAttribute("d", str);
repr->setAttribute("d", NULL);
}
+ SPPath *path = (SPPath *) object;
+ if ( path->original_curve != NULL ) {
+ NArtBpath *abp = path->original_curve->first_bpath();
+ if (abp) {
+ gchar *str = sp_svg_write_path(abp);
+ repr->setAttribute("inkscape:original-d", str);
+ g_free(str);
+ } else {
+ repr->setAttribute("inkscape:original-d", "");
+ }
+ } else {
+ repr->setAttribute("inkscape:original-d", NULL);
+ }
+
SP_PATH(shape)->connEndPair.writeRepr(repr);
if (((SPObjectClass *)(parent_class))->write) {
sp_path_set_transform(SPItem *item, NR::Matrix const &xform)
{
SPShape *shape = (SPShape *) item;
+ SPPath *path = (SPPath *) item;
if (!shape->curve) { // 0 nodes, nothing to transform
return NR::identity();
}
- /* Transform the path */
- NRBPath dpath, spath;
- spath.path = shape->curve->bpath;
- 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 or the (ordinary) path
+ bool original_path = (bool)path->original_curve;
+ SPCurve *srccurve = original_path ? path->original_curve : shape->curve;
+ SPCurve *dstcurve = srccurve->copy();
+ if (dstcurve) {
+ dstcurve->transform(xform);
+ if (original_path) {
+ sp_path_set_original_curve(path, dstcurve, TRUE, true);
+ } else {
+ sp_shape_set_curve(shape, dstcurve, TRUE);
+ }
+ dstcurve->unref();
}
// Adjust stroke
// 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();
}
+static void
+sp_path_update_patheffect(SPLPEItem *lpeitem, bool write)
+{
+ SPShape *shape = (SPShape *) lpeitem;
+ SPPath *path = (SPPath *) lpeitem;
+ if (path->original_curve) {
+ SPCurve *curve = path->original_curve->copy();
+ sp_shape_set_curve_insync(shape, curve, TRUE);
+ sp_lpe_item_perform_path_effect(SP_LPE_ITEM(shape), curve);
+ SP_OBJECT(shape)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+ curve->unref();
+
+ if (write) {
+ // could also do SP_OBJECT(shape)->updateRepr(); but only the d attribute needs updating.
+ Inkscape::XML::Node *repr = SP_OBJECT_REPR(shape);
+ if ( shape->curve != NULL ) {
+ NArtBpath *abp = shape->curve->first_bpath();
+ if (abp) {
+ gchar *str = sp_svg_write_path(abp);
+ repr->setAttribute("d", str);
+ g_free(str);
+ } else {
+ repr->setAttribute("d", "");
+ }
+ } else {
+ repr->setAttribute("d", NULL);
+ }
+ }
+ } else {
+
+ }
+}
+
+
+/**
+ * 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 the an effect is present
+ * an 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_path_update_patheffect(path, 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) {
+ 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) {
+ return path->original_curve;
+ } else {
+ return path->curve;
+ }
+}
+
+/* Create a single dot represented by a circle */
+void freehand_create_single_dot(SPEventContext *ec, NR::Point const &pt, char const *tool, guint event_state) {
+ g_return_if_fail(!strcmp(tool, "tools.freehand.pen") || !strcmp(tool, "tools.freehand.pencil"));
+
+ SPDesktop *desktop = SP_EVENT_CONTEXT_DESKTOP(ec);
+ Inkscape::XML::Document *xml_doc = sp_document_repr_doc(desktop->doc());
+ Inkscape::XML::Node *repr = xml_doc->createElement("svg:path");
+ repr->setAttribute("sodipodi:type", "arc");
+ SPItem *item = SP_ITEM(desktop->currentLayer()->appendChildRepr(repr));
+ Inkscape::GC::release(repr);
+
+ /* apply the tool's current style */
+ sp_desktop_apply_style_tool(desktop, repr, tool, false);
+
+ /* find out stroke width (TODO: is there an easier way??) */
+ double stroke_width = 3.0;
+ gchar const *style_str = NULL;
+ style_str = repr->attribute("style");
+ if (style_str) {
+ SPStyle *style = sp_style_new(SP_ACTIVE_DOCUMENT);
+ sp_style_merge_from_style_string(style, style_str);
+ stroke_width = style->stroke_width.computed;
+ style->stroke_width.computed = 0;
+ sp_style_unref(style);
+ }
+ /* unset stroke and set fill color to former stroke color */
+ gchar * str;
+ str = g_strdup_printf("fill:#%06x;stroke:none;", sp_desktop_get_color_tool(desktop, tool, false) >> 8);
+ repr->setAttribute("style", str);
+ g_free(str);
+
+ /* put the circle where the mouse click occurred and set the diameter to the
+ current stroke width, multiplied by the amount specified in the preferences */
+ NR::Matrix const i2d (sp_item_i2d_affine (item));
+ NR::Point pp = pt * i2d;
+ double rad = 0.5 * prefs_get_double_attribute(tool, "dot-size", 3.0);
+ if (event_state & GDK_MOD1_MASK) {
+ /* TODO: We vary the dot size between 0.5*rad and 1.5*rad, where rad is the dot size
+ as specified in prefs. Very simple, but it might be sufficient in practice. If not,
+ we need to devise something more sophisticated. */
+ double s = g_random_double_range(-0.5, 0.5);
+ rad *= (1 + s);
+ }
+ if (event_state & GDK_SHIFT_MASK) {
+ // double the point size
+ rad *= 2;
+ }
+
+ sp_repr_set_svg_double (repr, "sodipodi:cx", pp[NR::X]);
+ sp_repr_set_svg_double (repr, "sodipodi:cy", pp[NR::Y]);
+ sp_repr_set_svg_double (repr, "sodipodi:rx", rad * stroke_width);
+ sp_repr_set_svg_double (repr, "sodipodi:ry", rad * stroke_width);
+ item->updateRepr();
+
+ sp_desktop_selection(desktop)->set(item);
+
+ desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Creating single dot"));
+ sp_document_done(sp_desktop_document(desktop), SP_VERB_NONE, _("Create single dot"));
+}
/*
Local Variables: