![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/sp-shape.cpp b/src/sp-shape.cpp
index daf85b534deafabf47898d1cd2444bf559c573ae..054310472e5820ae5393ea40006aeadafa54eed1 100644 (file)
--- a/src/sp-shape.cpp
+++ b/src/sp-shape.cpp
-#define __SP_SHAPE_C__
-
/*
* Base class for shapes, including <path> element
*
* Copyright (C) 1999-2002 Lauris Kaplinski
* Copyright (C) 2000-2001 Ximian, Inc.
* Copyright (C) 2004 John Cliff
+ * Copyright (C) 2007-2008 Johan Engelen
*
* Released under GNU GPL, read the file 'COPYING' for more information
*/
# include "config.h"
#endif
-
-#include <libnr/n-art-bpath.h>
#include <libnr/nr-matrix-fns.h>
#include <libnr/nr-matrix-ops.h>
#include <libnr/nr-matrix-translate-ops.h>
#include <libnr/nr-scale-matrix-ops.h>
+#include <2geom/rect.h>
+#include <2geom/transforms.h>
+#include <2geom/pathvector.h>
+#include "helper/geom.h"
+#include "helper/geom-nodetype.h"
#include <sigc++/functors/ptr_fun.h>
#include <sigc++/adaptors/bind.h>
#include "macros.h"
#include "display/nr-arena-shape.h"
+#include "display/curve.h"
#include "print.h"
#include "document.h"
#include "style.h"
#include "prefs-utils.h"
#include "attributes.h"
-#include "live_effects/effect.h"
#include "live_effects/lpeobject.h"
-#include "live_effects/lpeobject-reference.h"
#include "uri.h"
#include "extract-uri.h"
#include "uri-references.h"
#include "bad-uri-exception.h"
#include "xml/repr.h"
+#include "util/mathfns.h" // for triangle_area()
+
#define noSHAPE_VERBOSE
static void sp_shape_class_init (SPShapeClass *klass);
static void sp_shape_set(SPObject *object, unsigned key, gchar const *value);
static void sp_shape_update (SPObject *object, SPCtx *ctx, unsigned int flags);
static void sp_shape_modified (SPObject *object, unsigned int flags);
-static Inkscape::XML::Node *sp_shape_write(SPObject *object, Inkscape::XML::Node *repr, guint flags);
+static Inkscape::XML::Node *sp_shape_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
static void sp_shape_bbox(SPItem const *item, NRRect *bbox, NR::Matrix const &transform, unsigned const flags);
void sp_shape_print (SPItem * item, SPPrintContext * ctx);
static void sp_shape_update_marker_view (SPShape *shape, NRArenaItem *ai);
-static void lpeobject_ref_changed(SPObject *old_ref, SPObject *ref, SPShape *shape);
-static void lpeobject_ref_modified(SPObject *href, guint flags, SPShape *shape);
-
-static SPItemClass *parent_class;
+static SPLPEItemClass *parent_class;
/**
* Registers the SPShape class with Gdk and returns its type number.
(GInstanceInitFunc) sp_shape_init,
NULL, /* value_table */
};
- type = g_type_register_static (SP_TYPE_ITEM, "SPShape", &info, (GTypeFlags)0);
+ type = g_type_register_static (SP_TYPE_LPE_ITEM, "SPShape", &info, (GTypeFlags)0);
}
return type;
}
static void
sp_shape_class_init (SPShapeClass *klass)
{
- GObjectClass *gobject_class;
- SPObjectClass *sp_object_class;
- SPItemClass * item_class;
- SPPathClass * path_class;
+ GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
+ SPObjectClass *sp_object_class = SP_OBJECT_CLASS(klass);
+ SPItemClass * item_class = SP_ITEM_CLASS(klass);
+ SPLPEItemClass * lpe_item_class = SP_LPE_ITEM_CLASS(klass);
- gobject_class = (GObjectClass *) klass;
- sp_object_class = (SPObjectClass *) klass;
- item_class = (SPItemClass *) klass;
- path_class = (SPPathClass *) klass;
-
- parent_class = (SPItemClass *)g_type_class_peek_parent (klass);
+ parent_class = (SPLPEItemClass *)g_type_class_peek_parent (klass);
gobject_class->finalize = sp_shape_finalize;
item_class->show = sp_shape_show;
item_class->hide = sp_shape_hide;
item_class->snappoints = sp_shape_snappoints;
+ lpe_item_class->update_patheffect = NULL;
klass->set_shape = NULL;
- klass->update_patheffect = NULL;
}
/**
static void
sp_shape_init (SPShape *shape)
{
- shape->path_effect_href = NULL;
- shape->path_effect_ref = new Inkscape::LivePathEffect::LPEObjectReference(SP_OBJECT(shape));
- new (&shape->lpe_modified_connection) sigc::connection();
-
for ( int i = 0 ; i < SP_MARKER_LOC_QTY ; i++ ) {
new (&shape->release_connect[i]) sigc::connection();
new (&shape->modified_connect[i]) sigc::connection();
static void
sp_shape_build (SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
{
- SP_SHAPE(object)->path_effect_ref->changedSignal().connect(sigc::bind(sigc::ptr_fun(lpeobject_ref_changed), SP_SHAPE(object)));
-
- sp_object_read_attr(object, "inkscape:path-effect");
-
if (((SPObjectClass *) (parent_class))->build) {
(*((SPObjectClass *) (parent_class))->build) (object, document, repr);
}
}
}
if (shape->curve) {
- shape->curve = sp_curve_unref (shape->curve);
+ shape->curve = shape->curve->unref();
}
-
- if (shape->path_effect_href) {
- g_free(shape->path_effect_href);
- }
- shape->path_effect_ref->detach();
-
- shape->lpe_modified_connection.disconnect();
- shape->lpe_modified_connection.~connection();
if (((SPObjectClass *) parent_class)->release) {
((SPObjectClass *) parent_class)->release (object);
static void
sp_shape_set(SPObject *object, unsigned int key, gchar const *value)
{
- SPShape *shape = (SPShape *) object;
-
- switch (key) {
- case SP_ATTR_INKSCAPE_PATH_EFFECT:
- if ( value && shape->path_effect_href && ( strcmp(value, shape->path_effect_href) == 0 ) ) {
- /* No change, do nothing. */
- } else {
- if (shape->path_effect_href) {
- g_free(shape->path_effect_href);
- shape->path_effect_href = NULL;
- }
- if (value) {
- shape->path_effect_href = g_strdup(value);
-
- // Now do the attaching, which emits the changed signal.
- try {
- shape->path_effect_ref->attach(Inkscape::URI(value));
- } catch (Inkscape::BadURIException &e) {
- g_warning("%s", e.what());
- shape->path_effect_ref->detach();
- }
- } else {
- // Detach, which emits the changed signal.
- shape->path_effect_ref->detach();
- }
- }
- break;
- default:
- if (((SPObjectClass *) parent_class)->set) {
- ((SPObjectClass *) parent_class)->set(object, key, value);
- }
- break;
+ if (((SPObjectClass *) parent_class)->set) {
+ ((SPObjectClass *) parent_class)->set(object, key, value);
}
}
static Inkscape::XML::Node *
-sp_shape_write(SPObject *object, Inkscape::XML::Node *repr, guint flags)
+sp_shape_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags)
{
- SPShape *shape = (SPShape *) object;
-
- if ( shape->path_effect_href ) {
- repr->setAttribute("inkscape:path-effect", shape->path_effect_href);
- } else {
- repr->setAttribute("inkscape:path-effect", NULL);
- }
-
if (((SPObjectClass *)(parent_class))->write) {
- ((SPObjectClass *)(parent_class))->write(object, repr, flags);
+ ((SPObjectClass *)(parent_class))->write(object, doc, repr, flags);
}
return repr;
if (flags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_PARENT_MODIFIED_FLAG)) {
/* This is suboptimal, because changing parent style schedules recalculation */
/* But on the other hand - how can we know that parent does not tie style and transform */
- NR::Maybe<NR::Rect> paintbox = SP_ITEM(object)->getBounds(NR::identity());
+ boost::optional<NR::Rect> paintbox = SP_ITEM(object)->getBounds(NR::identity());
for (SPItemView *v = SP_ITEM (shape)->display; v != NULL; v = v->next) {
NRArenaShape * const s = NR_ARENA_SHAPE(v->arenaitem);
if (flags & SP_OBJECT_MODIFIED_FLAG) {
}
}
-
-/**
-* Works out whether a marker of a given type is required at a particular
-* point on a shape.
-*
-* \param shape Shape of interest.
-* \param m Marker type (e.g. SP_MARKER_LOC_START)
-* \param bp Path segment.
-* \return 1 if a marker is required here, otherwise 0.
-*/
-bool
-sp_shape_marker_required(SPShape const *shape, int const m, NArtBpath *bp)
-{
- if (shape->marker[m] == NULL) {
- return false;
- }
-
- if (bp == SP_CURVE_BPATH(shape->curve))
- return m == SP_MARKER_LOC_START;
- else if (bp[1].code == NR_END)
- return m == SP_MARKER_LOC_END;
- else
- return m == SP_MARKER_LOC_MID;
-}
-
-static bool
-is_moveto(NRPathcode const c)
-{
- return c == NR_MOVETO || c == NR_MOVETO_OPEN;
-}
-
-/**
- * Helper function that advances a subpath's bpath to the first subpath
- * by checking for moveto segments.
- *
- * \pre The bpath[] containing bp begins with a moveto.
- */
-static NArtBpath const *
-first_seg_in_subpath(NArtBpath const *bp)
-{
- while (!is_moveto(bp->code)) {
- --bp;
- }
- return bp;
-}
-
/**
- * Advances the bpath to the last segment in the subpath.
- */
-static NArtBpath const *
-last_seg_in_subpath(NArtBpath const *bp)
-{
- for(;;) {
- ++bp;
- switch (bp->code) {
- case NR_MOVETO:
- case NR_MOVETO_OPEN:
- case NR_END:
- --bp;
- return bp;
-
- default: continue;
- }
- }
-}
-
-
-/* A subpath begins with a moveto and ends immediately before the next moveto or NR_END.
- * (`moveto' here means either NR_MOVETO or NR_MOVETO_OPEN.) I'm assuming that non-empty
- * paths always begin with a moveto.
- *
- * The control points of the subpath are the control points of the path elements of the subpath.
+ * Calculate the transform required to get a marker's path object in the
+ * right place for particular path segment on a shape.
*
- * As usual, the control points of a moveto or NR_LINETO are {c(3)}, and
- * the control points of a NR_CURVETO are {c(1), c(2), c(3)}.
- * (It follows from the definition that NR_END isn't part of a subpath.)
+ * \see sp_shape_marker_update_marker_view.
*
- * The initial control point is bpath[bi0].c(3).
+ * From SVG spec:
+ * The axes of the temporary new user coordinate system are aligned according to the orient attribute on the 'marker'
+ * element and the slope of the curve at the given vertex. (Note: if there is a discontinuity at a vertex, the slope
+ * is the average of the slopes of the two segments of the curve that join at the given vertex. If a slope cannot be
+ * determined, the slope is assumed to be zero.)
*
* Reference: http://www.w3.org/TR/SVG11/painting.html#MarkerElement, the `orient' attribute.
* Reference for behaviour of zero-length segments:
* http://www.w3.org/TR/SVG11/implnote.html#PathElementImplementationNotes
*/
-
-static double const no_tangent = 128.0; /* arbitrarily-chosen value outside the range of atan2, i.e. outside of [-pi, pi]. */
-
-/**
- * Helper function to calculate the outgoing tangent of a path
- * ( atan2(other - p0) )
- * \pre The bpath[] containing bp0 begins with a moveto.
- */
-static double
-outgoing_tangent(NArtBpath const *bp0)
+Geom::Matrix
+sp_shape_marker_get_transform(Geom::Curve const & c1, Geom::Curve const & c2)
{
- /* See notes in comment block above. */
-
- g_assert(bp0->code != NR_END);
- NR::Point const &p0 = bp0->c(3);
- NR::Point other;
- for (NArtBpath const *bp = bp0;;) {
- ++bp;
- switch (bp->code) {
- case NR_LINETO:
- other = bp->c(3);
- if (other != p0) {
- goto found;
- }
- break;
+ Geom::Point p = c1.pointAt(1);
+ Geom::Curve * c1_reverse = c1.reverse();
+ Geom::Point tang1 = - c1_reverse->unitTangentAt(0);
+ delete c1_reverse;
+ Geom::Point tang2 = c2.unitTangentAt(0);
- case NR_CURVETO:
- for (unsigned ci = 1; ci <= 3; ++ci) {
- other = bp->c(ci);
- if (other != p0) {
- goto found;
- }
- }
- break;
-
- case NR_MOVETO_OPEN:
- case NR_END:
- case NR_MOVETO:
- bp = first_seg_in_subpath(bp0);
- if (bp == bp0) {
- /* Gone right around the subpath without finding any different point since the
- * initial moveto. */
- return no_tangent;
- }
- if (bp->code != NR_MOVETO) {
- /* Open subpath. */
- return no_tangent;
- }
- other = bp->c(3);
- if (other != p0) {
- goto found;
- }
- break;
- }
-
- if (bp == bp0) {
- /* Back where we started, so zero-length subpath. */
- return no_tangent;
+ double const angle1 = Geom::atan2(tang1);
+ double const angle2 = Geom::atan2(tang2);
- /* Note: this test must come after we've looked at element bp, in case bp0 is a curve:
- * we must look at c(1) and c(2). (E.g. single-curve subpath.)
- */
- }
+ double ret_angle;
+ ret_angle = .5 * (angle1 + angle2);
+
+ if ( fabs( angle2 - angle1 ) > M_PI ) {
+ /* ret_angle is in the middle of the larger of the two sectors between angle1 and
+ * angle2, so flip it by 180degrees to force it to the middle of the smaller sector.
+ *
+ * (Imagine a circle with rays drawn at angle1 and angle2 from the centre of the
+ * circle. Those two rays divide the circle into two sectors.)
+ */
+ ret_angle += M_PI;
}
-found:
- return atan2( other - p0 );
+ return Geom::Rotate(ret_angle) * Geom::Translate(p);
}
-
-/**
- * Helper function to calculate the incoming tangent of a path
- * ( atan2(p0 - other) )
- *
- * \pre The bpath[] containing bp0 begins with a moveto.
- */
-static double
-incoming_tangent(NArtBpath const *bp0)
+Geom::Matrix
+sp_shape_marker_get_transform_at_start(Geom::Curve const & c)
{
- /* See notes in comment block before outgoing_tangent. */
-
- g_assert(bp0->code != NR_END);
- NR::Point const &p0 = bp0->c(3);
- NR::Point other;
- for (NArtBpath const *bp = bp0;;) {
- switch (bp->code) {
- case NR_LINETO:
- other = bp->c(3);
- if (other != p0) {
- goto found;
- }
- --bp;
- break;
-
- case NR_CURVETO:
- for (unsigned ci = 3; ci != 0; --ci) {
- other = bp->c(ci);
- if (other != p0) {
- goto found;
- }
- }
- --bp;
- break;
-
- case NR_MOVETO:
- case NR_MOVETO_OPEN:
- other = bp->c(3);
- if (other != p0) {
- goto found;
- }
- if (bp->code != NR_MOVETO) {
- /* Open subpath. */
- return no_tangent;
- }
- bp = last_seg_in_subpath(bp0);
- break;
+ Geom::Point p = c.pointAt(0);
+ Geom::Point tang = c.unitTangentAt(0);
- default: /* includes NR_END */
- g_error("Found invalid path code %u in middle of path.", bp->code);
- return no_tangent;
- }
+ double const angle = Geom::atan2(tang);
- if (bp == bp0) {
- /* Back where we started from: zero-length subpath. */
- return no_tangent;
- }
- }
-
-found:
- return atan2( p0 - other );
+ return Geom::Rotate(angle) * Geom::Translate(p);
}
-
-
-/**
- * Calculate the transform required to get a marker's path object in the
- * right place for particular path segment on a shape. You should
- * call sp_shape_marker_required first to see if a marker is required
- * at this point.
- *
- * \see sp_shape_marker_required.
- *
- * \param shape Shape which the marker is for.
- * \param m Marker type (e.g. SP_MARKER_LOC_START)
- * \param bp Path segment which the arrow is for.
- * \return Transform matrix.
- */
-NR::Matrix
-sp_shape_marker_get_transform(SPShape const *shape, NArtBpath const *bp)
+Geom::Matrix
+sp_shape_marker_get_transform_at_end(Geom::Curve const & c)
{
- g_return_val_if_fail(( is_moveto(SP_CURVE_BPATH(shape->curve)[0].code)
- && ( 0 < shape->curve->end )
- && ( SP_CURVE_BPATH(shape->curve)[shape->curve->end].code == NR_END ) ),
- NR::Matrix(NR::translate(bp->c(3))));
- double const angle1 = incoming_tangent(bp);
- double const angle2 = outgoing_tangent(bp);
-
- /* angle1 and angle2 are now each either unset (i.e. still 100 from their initialization) or in
- [-pi, pi] from atan2. */
- g_assert((-3.15 < angle1 && angle1 < 3.15) || (angle1 == no_tangent));
- g_assert((-3.15 < angle2 && angle2 < 3.15) || (angle2 == no_tangent));
+ Geom::Point p = c.pointAt(1);
+ Geom::Curve * c_reverse = c.reverse();
+ Geom::Point tang = - c_reverse->unitTangentAt(0);
+ delete c_reverse;
- double ret_angle;
- if (angle1 == no_tangent) {
- /* First vertex of an open subpath. */
- ret_angle = ( angle2 == no_tangent
- ? 0.
- : angle2 );
- } else if (angle2 == no_tangent) {
- /* Last vertex of an open subpath. */
- ret_angle = angle1;
- } else {
- ret_angle = .5 * (angle1 + angle2);
-
- if ( fabs( angle2 - angle1 ) > M_PI ) {
- /* ret_angle is in the middle of the larger of the two sectors between angle1 and
- * angle2, so flip it by 180degrees to force it to the middle of the smaller sector.
- *
- * (Imagine a circle with rays drawn at angle1 and angle2 from the centre of the
- * circle. Those two rays divide the circle into two sectors.)
- */
- ret_angle += M_PI;
- }
- }
+ double const angle = Geom::atan2(tang);
- return NR::Matrix(NR::rotate(ret_angle)) * NR::translate(bp->c(3));
+ return Geom::Rotate(angle) * Geom::Translate(p);
}
/**
* Updates the instances (views) of a given marker in a shape.
* Marker views have to be scaled already. The transformation
* is retrieved and then shown by calling sp_marker_show_instance.
+ *
+ * TODO: correctly handle the 'marker' attribute.
+ * "Using the marker property from a style sheet is equivalent to using all three (start, mid, end)."
+ * See painting-marker-03-f.svg in SVG 1.1 Full test suite.
*/
static void
sp_shape_update_marker_view (SPShape *shape, NRArenaItem *ai)
{
- SPStyle *style = ((SPObject *) shape)->style;
+ SPStyle *style = ((SPObject *) shape)->style;
+
+ // position arguments to sp_marker_show_instance, basically counts the amount of markers.
+ int start_pos = 0;
+ int mid_pos = 0;
+ int end_pos = 0;
+
+ Geom::PathVector const & pathv = shape->curve->get_pathvector();
+ for(Geom::PathVector::const_iterator path_it = pathv.begin(); path_it != pathv.end(); ++path_it) {
+ if ( shape->marker[SP_MARKER_LOC_START] ) {
+ Geom::Matrix const m (sp_shape_marker_get_transform_at_start(path_it->front()));
+ sp_marker_show_instance ((SPMarker* ) shape->marker[SP_MARKER_LOC_START], ai,
+ NR_ARENA_ITEM_GET_KEY(ai) + SP_MARKER_LOC_START, start_pos, m,
+ style->stroke_width.computed);
+ start_pos++;
+ }
- for (int i = SP_MARKER_LOC_START; i < SP_MARKER_LOC_QTY; i++) {
- if (shape->marker[i] == NULL) {
- continue;
+ if ( shape->marker[SP_MARKER_LOC_MID] ) {
+ Geom::Path::const_iterator curve_it1 = path_it->begin(); // incoming curve
+ Geom::Path::const_iterator curve_it2 = ++(path_it->begin()); // outgoing curve
+ while (curve_it2 != path_it->end_default())
+ {
+ /* Put marker between curve_it1 and curve_it2.
+ * Loop to end_default (so including closing segment), because when a path is closed,
+ * there should be a midpoint marker between last segment and closing straight line segment
+ */
+ Geom::Matrix const m (sp_shape_marker_get_transform(*curve_it1, *curve_it2));
+ sp_marker_show_instance ((SPMarker* ) shape->marker[SP_MARKER_LOC_MID], ai,
+ NR_ARENA_ITEM_GET_KEY(ai) + SP_MARKER_LOC_MID, mid_pos, m,
+ style->stroke_width.computed);
+ mid_pos++;
+
+ ++curve_it1;
+ ++curve_it2;
}
+ }
- int n = 0;
-
- for (NArtBpath *bp = SP_CURVE_BPATH(shape->curve); bp->code != NR_END; bp++) {
- if (sp_shape_marker_required (shape, i, bp)) {
- NR::Matrix const m(sp_shape_marker_get_transform(shape, bp));
- sp_marker_show_instance ((SPMarker* ) shape->marker[i], ai,
- NR_ARENA_ITEM_GET_KEY(ai) + i, n, m,
- style->stroke_width.computed);
- n++;
- }
- }
- }
+ if ( shape->marker[SP_MARKER_LOC_END] ) {
+ Geom::Matrix const m (sp_shape_marker_get_transform_at_end(path_it->back_default()));
+ sp_marker_show_instance ((SPMarker* ) shape->marker[SP_MARKER_LOC_END], ai,
+ NR_ARENA_ITEM_GET_KEY(ai) + SP_MARKER_LOC_END, end_pos, m,
+ style->stroke_width.computed);
+ end_pos++;
+ }
+ }
}
/**
@@ -702,14 +470,12 @@ static void sp_shape_bbox(SPItem const *item, NRRect *bbox, NR::Matrix const &tr
if (shape->curve) {
NRRect cbbox;
- NRBPath bp;
-
- bp.path = SP_CURVE_BPATH (shape->curve);
- cbbox.x0 = cbbox.y0 = NR_HUGE;
- cbbox.x1 = cbbox.y1 = -NR_HUGE;
-
- nr_path_matrix_bbox_union(&bp, transform, &cbbox);
+ Geom::Rect geombbox = bounds_exact_transformed(shape->curve->get_pathvector(), to_2geom(transform));
+ cbbox.x0 = geombbox[0][0];
+ cbbox.y0 = geombbox[1][0];
+ cbbox.x1 = geombbox[0][1];
+ cbbox.y1 = geombbox[1][1];
if ((SPItem::BBoxType) flags != SPItem::GEOMETRIC_BBOX) {
@@ -729,14 +495,42 @@ static void sp_shape_bbox(SPItem const *item, NRRect *bbox, NR::Matrix const &tr
// Union with bboxes of the markers, if any
if (sp_shape_has_markers (shape)) {
- for (NArtBpath* bp = SP_CURVE_BPATH(shape->curve); bp->code != NR_END; bp++) {
- for (int m = SP_MARKER_LOC_START; m < SP_MARKER_LOC_QTY; m++) {
- if (sp_shape_marker_required (shape, m, bp)) {
+ /* TODO: make code prettier: lots of variables can be taken out of the loop! */
+ Geom::PathVector const & pathv = shape->curve->get_pathvector();
+ for(Geom::PathVector::const_iterator path_it = pathv.begin(); path_it != pathv.end(); ++path_it) {
+ if ( shape->marker[SP_MARKER_LOC_START] ) {
+ SPMarker* marker = SP_MARKER (shape->marker[SP_MARKER_LOC_START]);
+ SPItem* marker_item = sp_item_first_item_child (SP_OBJECT (shape->marker[SP_MARKER_LOC_START]));
+
+ NR::Matrix tr(from_2geom(sp_shape_marker_get_transform_at_start(path_it->front())));
- SPMarker* marker = SP_MARKER (shape->marker[m]);
- SPItem* marker_item = sp_item_first_item_child (SP_OBJECT (shape->marker[m]));
+ if (marker->markerUnits == SP_MARKER_UNITS_STROKEWIDTH) {
+ tr = NR::scale(style->stroke_width.computed) * tr;
+ }
- NR::Matrix tr(sp_shape_marker_get_transform(shape, bp));
+ // total marker transform
+ tr = marker_item->transform * marker->c2p * tr * transform;
+
+ // get bbox of the marker with that transform
+ NRRect marker_bbox;
+ sp_item_invoke_bbox (marker_item, &marker_bbox, tr, true);
+ // union it with the shape bbox
+ nr_rect_d_union (&cbbox, &cbbox, &marker_bbox);
+ }
+
+ if ( shape->marker[SP_MARKER_LOC_MID] ) {
+ Geom::Path::const_iterator curve_it1 = path_it->begin(); // incoming curve
+ Geom::Path::const_iterator curve_it2 = ++(path_it->begin()); // outgoing curve
+ while (curve_it2 != path_it->end_default())
+ {
+ /* Put marker between curve_it1 and curve_it2.
+ * Loop to end_default (so including closing segment), because when a path is closed,
+ * there should be a midpoint marker between last segment and closing straight line segment */
+
+ SPMarker* marker = SP_MARKER (shape->marker[SP_MARKER_LOC_MID]);
+ SPItem* marker_item = sp_item_first_item_child (SP_OBJECT (shape->marker[SP_MARKER_LOC_MID]));
+
+ NR::Matrix tr(from_2geom(sp_shape_marker_get_transform(*curve_it1, *curve_it2)));
if (marker->markerUnits == SP_MARKER_UNITS_STROKEWIDTH) {
tr = NR::scale(style->stroke_width.computed) * tr;
@@ -750,8 +544,31 @@ static void sp_shape_bbox(SPItem const *item, NRRect *bbox, NR::Matrix const &tr
sp_item_invoke_bbox (marker_item, &marker_bbox, tr, true);
// union it with the shape bbox
nr_rect_d_union (&cbbox, &cbbox, &marker_bbox);
+
+ ++curve_it1;
+ ++curve_it2;
}
}
+
+ if ( shape->marker[SP_MARKER_LOC_END] ) {
+ SPMarker* marker = SP_MARKER (shape->marker[SP_MARKER_LOC_END]);
+ SPItem* marker_item = sp_item_first_item_child (SP_OBJECT (shape->marker[SP_MARKER_LOC_END]));
+
+ NR::Matrix tr(from_2geom(sp_shape_marker_get_transform_at_end(path_it->back_default())));
+
+ if (marker->markerUnits == SP_MARKER_UNITS_STROKEWIDTH) {
+ tr = NR::scale(style->stroke_width.computed) * tr;
+ }
+
+ // total marker transform
+ tr = marker_item->transform * marker->c2p * tr * transform;
+
+ // get bbox of the marker with that transform
+ NRRect marker_bbox;
+ sp_item_invoke_bbox (marker_item, &marker_bbox, tr, true);
+ // union it with the shape bbox
+ nr_rect_d_union (&cbbox, &cbbox, &marker_bbox);
+ }
}
}
}
dbox.x1 = sp_document_width (SP_OBJECT_DOCUMENT (item));
dbox.y1 = sp_document_height (SP_OBJECT_DOCUMENT (item));
sp_item_bbox_desktop (item, &bbox);
- NR::Matrix const i2d = sp_item_i2d_affine(item);
+ NR::Matrix const i2d = from_2geom(sp_item_i2d_affine(item));
SPStyle* style = SP_OBJECT_STYLE (item);
- if (!style->fill.isNone()) {
- NRBPath bp;
- bp.path = SP_CURVE_BPATH(shape->curve);
- sp_print_fill (ctx, &bp, i2d, style, &pbox, &dbox, &bbox);
- }
+ if (!style->fill.isNone()) {
+ sp_print_fill (ctx, shape->curve->get_pathvector(), &i2d, style, &pbox, &dbox, &bbox);
+ }
- if (!style->stroke.isNone()) {
- NRBPath bp;
- bp.path = SP_CURVE_BPATH(shape->curve);
- sp_print_stroke (ctx, &bp, i2d, style, &pbox, &dbox, &bbox);
- }
+ if (!style->stroke.isNone()) {
+ sp_print_stroke (ctx, shape->curve->get_pathvector(), &i2d, style, &pbox, &dbox, &bbox);
+ }
- for (NArtBpath* bp = SP_CURVE_BPATH(shape->curve); bp->code != NR_END; bp++) {
- for (int m = SP_MARKER_LOC_START; m < SP_MARKER_LOC_QTY; m++) {
- if (sp_shape_marker_required (shape, m, bp)) {
+ /* TODO: make code prettier: lots of variables can be taken out of the loop! */
+ Geom::PathVector const & pathv = shape->curve->get_pathvector();
+ for(Geom::PathVector::const_iterator path_it = pathv.begin(); path_it != pathv.end(); ++path_it) {
+ if ( shape->marker[SP_MARKER_LOC_START] ) {
+ SPMarker* marker = SP_MARKER (shape->marker[SP_MARKER_LOC_START]);
+ SPItem* marker_item = sp_item_first_item_child (SP_OBJECT (shape->marker[SP_MARKER_LOC_START]));
- SPMarker* marker = SP_MARKER (shape->marker[m]);
- SPItem* marker_item = sp_item_first_item_child (SP_OBJECT (shape->marker[m]));
+ NR::Matrix tr(from_2geom(sp_shape_marker_get_transform_at_start(path_it->front())));
- NR::Matrix tr(sp_shape_marker_get_transform(shape, bp));
+ if (marker->markerUnits == SP_MARKER_UNITS_STROKEWIDTH) {
+ tr = NR::scale(style->stroke_width.computed) * tr;
+ }
- if (marker->markerUnits == SP_MARKER_UNITS_STROKEWIDTH) {
- tr = NR::scale(style->stroke_width.computed) * tr;
- }
+ tr = marker_item->transform * marker->c2p * tr;
- tr = marker_item->transform * marker->c2p * tr;
+ NR::Matrix old_tr = marker_item->transform;
+ marker_item->transform = tr;
+ sp_item_invoke_print (marker_item, ctx);
+ marker_item->transform = old_tr;
+ }
+
+ if ( shape->marker[SP_MARKER_LOC_MID] ) {
+ Geom::Path::const_iterator curve_it1 = path_it->begin(); // incoming curve
+ Geom::Path::const_iterator curve_it2 = ++(path_it->begin()); // outgoing curve
+ while (curve_it2 != path_it->end_default())
+ {
+ /* Put marker between curve_it1 and curve_it2.
+ * Loop to end_default (so including closing segment), because when a path is closed,
+ * there should be a midpoint marker between last segment and closing straight line segment */
+
+ SPMarker* marker = SP_MARKER (shape->marker[SP_MARKER_LOC_MID]);
+ SPItem* marker_item = sp_item_first_item_child (SP_OBJECT (shape->marker[SP_MARKER_LOC_MID]));
- NR::Matrix old_tr = marker_item->transform;
- marker_item->transform = tr;
- sp_item_invoke_print (marker_item, ctx);
- marker_item->transform = old_tr;
+ NR::Matrix tr(from_2geom(sp_shape_marker_get_transform(*curve_it1, *curve_it2)));
+
+ if (marker->markerUnits == SP_MARKER_UNITS_STROKEWIDTH) {
+ tr = NR::scale(style->stroke_width.computed) * tr;
}
+
+ tr = marker_item->transform * marker->c2p * tr;
+
+ NR::Matrix old_tr = marker_item->transform;
+ marker_item->transform = tr;
+ sp_item_invoke_print (marker_item, ctx);
+ marker_item->transform = old_tr;
+
+ ++curve_it1;
+ ++curve_it2;
+ }
+ }
+
+ if ( shape->marker[SP_MARKER_LOC_END] ) {
+ SPMarker* marker = SP_MARKER (shape->marker[SP_MARKER_LOC_END]);
+ SPItem* marker_item = sp_item_first_item_child (SP_OBJECT (shape->marker[SP_MARKER_LOC_END]));
+
+ NR::Matrix tr(from_2geom(sp_shape_marker_get_transform_at_end(path_it->back_default())));
+
+ if (marker->markerUnits == SP_MARKER_UNITS_STROKEWIDTH) {
+ tr = NR::scale(style->stroke_width.computed) * tr;
}
+
+ tr = marker_item->transform * marker->c2p * tr;
+
+ NR::Matrix old_tr = marker_item->transform;
+ marker_item->transform = tr;
+ sp_item_invoke_print (marker_item, ctx);
+ marker_item->transform = old_tr;
}
+ }
if (add_comments) {
gchar * comment = g_strdup_printf("end '%s'",
NRArenaShape * const s = NR_ARENA_SHAPE(arenaitem);
nr_arena_shape_set_style(s, object->style);
nr_arena_shape_set_path(s, shape->curve, false);
- NR::Maybe<NR::Rect> paintbox = item->getBounds(NR::identity());
+ boost::optional<NR::Rect> paintbox = item->getBounds(NR::identity());
if (paintbox) {
s->setPaintBox(*paintbox);
}
int
sp_shape_number_of_markers (SPShape *shape, int type)
{
- int n = 0;
- for (NArtBpath* bp = SP_CURVE_BPATH(shape->curve); bp->code != NR_END; bp++) {
- if (sp_shape_marker_required (shape, type, bp)) {
- n++;
+ Geom::PathVector const & pathv = shape->curve->get_pathvector();
+
+ switch(type) {
+ case SP_MARKER_LOC_START:
+ return shape->marker[SP_MARKER_LOC_START] ? pathv.size() : 0;
+
+ case SP_MARKER_LOC_MID:
+ {
+ if ( shape->marker[SP_MARKER_LOC_MID] ) {
+ guint n = 0;
+ for(Geom::PathVector::const_iterator path_it = pathv.begin(); path_it != pathv.end(); ++path_it) {
+ n += path_it->size();
+ n += path_it->closed() ? 1 : 0;
+ }
+ return n;
+ } else {
+ return 0;
+ }
+ }
+
+ case SP_MARKER_LOC_END:
+ {
+ if ( shape->marker[SP_MARKER_LOC_END] ) {
+ guint n = 0;
+ for(Geom::PathVector::const_iterator path_it = pathv.begin(); path_it != pathv.end(); ++path_it) {
+ if (!path_it->empty()) {
+ n++;
+ }
+ }
+ return n;
+ } else {
+ return 0;
+ }
}
- }
- return n;
+ default:
+ return 0;
+ }
}
/**
sp_shape_set_curve (SPShape *shape, SPCurve *curve, unsigned int owner)
{
if (shape->curve) {
- shape->curve = sp_curve_unref (shape->curve);
+ shape->curve = shape->curve->unref();
}
if (curve) {
if (owner) {
- shape->curve = sp_curve_ref (curve);
+ shape->curve = curve->ref();
} else {
- shape->curve = sp_curve_copy (curve);
+ shape->curve = curve->copy();
}
}
SP_OBJECT(shape)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
sp_shape_get_curve (SPShape *shape)
{
if (shape->curve) {
- return sp_curve_copy (shape->curve);
+ return shape->curve->copy();
}
return NULL;
}
-/* NOT FOR GENERAL PUBLIC UNTIL SORTED OUT (Lauris) */
+/**
+ * Same as sp_shape_set_curve but without updating the display
+ */
void
sp_shape_set_curve_insync (SPShape *shape, SPCurve *curve, unsigned int owner)
{
if (shape->curve) {
- shape->curve = sp_curve_unref (shape->curve);
+ shape->curve = shape->curve->unref();
}
if (curve) {
if (owner) {
- shape->curve = sp_curve_ref (curve);
+ shape->curve = curve->ref();
} else {
- shape->curve = sp_curve_copy (curve);
+ shape->curve = curve->copy();
}
}
}
/**
* Return all nodes in a path that are to be considered for snapping
- *
- * If the attribute "sodipodi:nodetypes" has been set, then this will be used
- * to discard any node on a smooth part of the path, i.e. only cusps will be returned
*/
static void sp_shape_snappoints(SPItem const *item, SnapPointsIter p)
{
return;
}
- NR::Matrix const i2d (sp_item_i2d_affine (item));
-
- /* Use the end points of each segment of the path */
- NArtBpath const *bp = SP_CURVE_BPATH(shape->curve);
-
- gchar const *nodetypes = item->repr->attribute("sodipodi:nodetypes");
- int nodetype_index = 0;
-
- bool nodetypes_out_of_date = strlen(nodetypes) != uint(shape->curve->end);
- // nodetypes might still be empty, e.g. for pure SVG files
- // or it might not have been updated yet
-
- if (bp->code == NR_MOVETO) { // Indicates the start of a closed subpath, see nr-path-code.h
- bp++; //The first point of a closed path is coincident with the end point. Skip the first point as we need only one
- nodetype_index++;
- }
-
- while (bp->code != NR_END) {
- if (nodetypes_out_of_date || nodetypes[nodetype_index] == 'c') {
- // if nodetypes is out of date then return any node for snapping
- // otherwise only return cusps (i.e . non-smooth nodes)
- *p = bp->c(3) * i2d;
- }
- bp++;
- nodetype_index++;
- }
-}
+ Geom::PathVector const &pathv = shape->curve->get_pathvector();
+ if (pathv.empty())
+ return;
+ Geom::Matrix const i2d (sp_item_i2d_affine (item));
-LivePathEffectObject *
-sp_shape_get_livepatheffectobject(SPShape *shape) {
- if (!shape) return NULL;
+ for(Geom::PathVector::const_iterator path_it = pathv.begin(); path_it != pathv.end(); ++path_it) {
+ *p = from_2geom(path_it->initialPoint() * i2d);
- if (sp_shape_has_path_effect(shape)) {
- return shape->path_effect_ref->lpeobject;
- } else {
- return NULL;
- }
-}
+ Geom::Path::const_iterator curve_it1 = path_it->begin(); // incoming curve
+ Geom::Path::const_iterator curve_it2 = ++(path_it->begin()); // outgoing curve
+ while (curve_it2 != path_it->end_closed())
+ {
+ /* Test whether to add the node between curve_it1 and curve_it2.
+ * Loop to end_closed (so always including closing segment), the last node to be added
+ * is the node between the closing segment and the segment before that one. Regardless
+ * of the path being closed. If the path is closed, the final point was already added by
+ * adding the initial point. */
-/**
- * Calls any registered handlers for the update_patheffect action
- */
-void
-sp_shape_update_patheffect (SPShape *shape, bool write)
-{
-#ifdef SHAPE_VERBOSE
- g_message("sp_shape_update_patheffect: %p\n", shape);
-#endif
- g_return_if_fail (shape != NULL);
- g_return_if_fail (SP_IS_SHAPE (shape));
-
- if (SP_SHAPE_CLASS (G_OBJECT_GET_CLASS (shape))->update_patheffect) {
- SP_SHAPE_CLASS (G_OBJECT_GET_CLASS (shape))->update_patheffect (shape, write);
- }
-}
-
-void sp_shape_perform_path_effect(SPCurve *curve, SPShape *shape) {
- if (!shape) return;
- if (!curve) return;
-
- LivePathEffectObject *lpeobj = sp_shape_get_livepatheffectobject(shape);
- if (lpeobj && lpeobj->lpe) {
- lpeobj->lpe->doEffect(curve);
- }
-}
+ Geom::NodeType nodetype = Geom::get_nodetype(*curve_it1, *curve_it2);
-/**
- * Gets called when (re)attached to another lpeobject.
- */
-static void
-lpeobject_ref_changed(SPObject *old_ref, SPObject *ref, SPShape *shape)
-{
- if (old_ref) {
- sp_signal_disconnect_by_data(old_ref, shape);
- }
- if ( IS_LIVEPATHEFFECT(ref) && ref != shape )
- {
- shape->lpe_modified_connection.disconnect();
- shape->lpe_modified_connection = ref->connectModified(sigc::bind(sigc::ptr_fun(&lpeobject_ref_modified), shape));
- lpeobject_ref_modified(ref, 0, shape);
- }
-}
-
-/**
- * Gets called when lpeobject repr contents change: i.e. parameter change.
- */
-static void
-lpeobject_ref_modified(SPObject */*href*/, guint /*flags*/, SPShape *shape)
-{
- sp_shape_update_patheffect (shape, true);
-}
-
-void sp_shape_set_path_effect(SPShape *shape, gchar *value)
-{
- if (!value) {
- sp_shape_remove_path_effect(shape);
- } else {
- SP_OBJECT_REPR(shape)->setAttribute("inkscape:path-effect", value);
- }
-}
-
-void sp_shape_remove_path_effect(SPShape *shape)
-{
- Inkscape::XML::Node *repr = SP_OBJECT_REPR(shape);
- repr->setAttribute("inkscape:path-effect", NULL);
- if (SP_IS_PATH(shape)) {
- repr->setAttribute("d", repr->attribute("inkscape:original-d"));
- repr->setAttribute("inkscape:original-d", NULL);
- }
-}
-
-bool sp_shape_has_path_effect(SPShape *shape)
-{
- return (shape->path_effect_href != NULL);
-}
+ // Only add cusp nodes. TODO: Shouldn't this be a preference instead?
+ if (nodetype == Geom::NODE_NONE) {
+ *p = from_2geom(curve_it1->finalPoint() * i2d);
+ }
+ if (nodetype == Geom::NODE_CUSP) {
+ *p = from_2geom(curve_it1->finalPoint() * i2d);
+ }
-void sp_shape_edit_next_param_oncanvas(SPShape *shape, SPDesktop *dt)
-{
- LivePathEffectObject *lpeobj = sp_shape_get_livepatheffectobject(shape);
- if (lpeobj && lpeobj->lpe) {
- lpeobj->lpe->editNextParamOncanvas(SP_ITEM(shape), dt);
+ ++curve_it1;
+ ++curve_it2;
+ }
}
}