![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/sp-shape.cpp b/src/sp-shape.cpp
index 56589bab974cea8827daf415f226addc2b9ebfe6..054310472e5820ae5393ea40006aeadafa54eed1 100644 (file)
--- a/src/sp-shape.cpp
+++ b/src/sp-shape.cpp
# 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 <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>
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 const *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.
- *
- * 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.)
- *
- * The initial control point is bpath[bi0].c(3).
- *
- * 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]. This value is incremented by
- * 1 and checked using > to be safe from floating-point
- * equality comparison madness.*/
-
-/**
- * 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)
-{
- /* 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;
-
- 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 + 1;
- }
- if (bp->code != NR_MOVETO) {
- /* Open subpath. */
- return no_tangent + 1;
- }
- other = bp->c(3);
- if (other != p0) {
- goto found;
- }
- break;
- }
-
- if (bp == bp0) {
- /* Back where we started, so zero-length subpath. */
- return no_tangent + 1;
-
- /* 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.)
- */
- }
- }
-
-found:
- return atan2( other - p0 );
-}
-
-/**
- * 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)
-{
- /* 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 + 1;
- }
- bp = last_seg_in_subpath(bp0);
- break;
-
- default: /* includes NR_END */
- g_error("Found invalid path code %u in middle of path.", bp->code);
- return no_tangent + 1;
- }
-
- if (bp == bp0) {
- /* Back where we started from: zero-length subpath. */
- return no_tangent + 1;
- }
- }
-
-found:
- return atan2( p0 - other );
-}
-
-
-/**
- * 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)
-{
- g_return_val_if_fail(( is_moveto(SP_CURVE_BPATH(shape->curve)[0].code)
- && ( 0 < shape->curve->get_length() )
- && ( SP_CURVE_BPATH(shape->curve)[shape->curve->get_length()].code == NR_END ) ),
- NR::Matrix(NR::translate(bp->c(3))));
- double const angle1 = incoming_tangent(bp);
- double const angle2 = outgoing_tangent(bp);
-
- 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;
- }
- }
-
- return NR::Matrix(NR::rotate(ret_angle)) * NR::translate(bp->c(3));
-}
-
/**
* Calculate the transform required to get a marker's path object in the
* right place for particular path segment on a shape.
*
* \see sp_shape_marker_update_marker_view.
*
- * \param p Point where the marker should be placed.
- * \param t1 Tangent of end of curvesegment before marker
- * \param t2 Tangent of start of curvesegment after marker
- * \return Transform matrix.
- *
* 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
*/
Geom::Matrix
-sp_shape_marker_get_transform(Geom::Point & p, Geom::Point & t1, Geom::Point & t2)
+sp_shape_marker_get_transform(Geom::Curve const & c1, Geom::Curve const & c2)
{
- double const angle1 = Geom::atan2(t1);
- double const angle2 = Geom::atan2(t2);
+ 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);
+
+ double const angle1 = Geom::atan2(tang1);
+ double const angle2 = Geom::atan2(tang2);
double ret_angle;
ret_angle = .5 * (angle1 + angle2);
@@ -620,6 +358,28 @@ sp_shape_marker_get_transform(Geom::Point & p, Geom::Point & t1, Geom::Point & t
return Geom::Rotate(ret_angle) * Geom::Translate(p);
}
+Geom::Matrix
+sp_shape_marker_get_transform_at_start(Geom::Curve const & c)
+{
+ Geom::Point p = c.pointAt(0);
+ Geom::Point tang = c.unitTangentAt(0);
+
+ double const angle = Geom::atan2(tang);
+
+ return Geom::Rotate(angle) * Geom::Translate(p);
+}
+Geom::Matrix
+sp_shape_marker_get_transform_at_end(Geom::Curve const & c)
+{
+ Geom::Point p = c.pointAt(1);
+ Geom::Curve * c_reverse = c.reverse();
+ Geom::Point tang = - c_reverse->unitTangentAt(0);
+ delete c_reverse;
+
+ double const angle = Geom::atan2(tang);
+
+ return Geom::Rotate(angle) * Geom::Translate(p);
+}
/**
* Updates the instances (views) of a given marker in a shape.
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::Point p = path_it->front().pointAt(0);
- Geom::Point tang = path_it->front().unitTangentAt(0);
- Geom::Matrix const m (sp_shape_marker_get_transform(p, tang, tang));
+ 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);
* 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::Point p = curve_it1->pointAt(1);
- Geom::Point tang1 = curve_it1->unitTangentAt(1);
- Geom::Point tang2 = curve_it2->unitTangentAt(0);
- Geom::Matrix const m (sp_shape_marker_get_transform(p, tang1, tang2));
+ 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);
}
if ( shape->marker[SP_MARKER_LOC_END] ) {
- Geom::Point p = path_it->back_default().pointAt(1);
- Geom::Point tang = path_it->back_default().unitTangentAt(1);
- Geom::Matrix const m (sp_shape_marker_get_transform(p, tang, tang));
+ 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);
@@ -742,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 const* 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())));
+
+ 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;
- SPMarker* marker = SP_MARKER (shape->marker[m]);
- SPItem* marker_item = sp_item_first_item_child (SP_OBJECT (shape->marker[m]));
+ // 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(sp_shape_marker_get_transform(shape, bp));
+ 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;
@@ -763,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);
+ }
}
}
}
SPStyle* style = SP_OBJECT_STYLE (item);
if (!style->fill.isNone()) {
- const_NRBPath bp;
- bp.path = SP_CURVE_BPATH(shape->curve);
- sp_print_fill (ctx, &bp, &i2d, style, &pbox, &dbox, &bbox);
+ sp_print_fill (ctx, shape->curve->get_pathvector(), &i2d, style, &pbox, &dbox, &bbox);
}
if (!style->stroke.isNone()) {
- const_NRBPath bp;
- bp.path = SP_CURVE_BPATH(shape->curve);
- sp_print_stroke (ctx, &bp, &i2d, style, &pbox, &dbox, &bbox);
+ sp_print_stroke (ctx, shape->curve->get_pathvector(), &i2d, style, &pbox, &dbox, &bbox);
}
- for (NArtBpath const* 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;
+ }
- 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 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'",
SP_OBJECT(item)->defaultLabel());
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 const* 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;
+ }
}
/**
if (shape->curve == NULL) {
return;
}
-
- NR::Matrix const i2d (from_2geom(sp_item_i2d_affine (item)));
- NArtBpath const *b = SP_CURVE_BPATH(shape->curve);
-
- // Cycle through the nodes in the concatenated subpaths
- while (b->code != NR_END) {
- NR::Point pos = b->c(3) * i2d; // this is the current node
-
- // NR_MOVETO Indicates the start of a closed subpath, see nr-path-code.h
- // If we're looking at a closed subpath, then we can skip this first
- // point of the subpath because it's coincident with the last point.
- if (b->code != NR_MOVETO) {
- if (b->code == NR_MOVETO_OPEN || b->code == NR_LINETO || b[1].code == NR_LINETO || b[1].code == NR_END) {
- // end points of a line segment are always considered for snapping
- *p = pos;
- } else {
- // g_assert(b->code == NR_CURVETO);
- NR::Point ppos, npos;
- ppos = b->code == NR_CURVETO ? b->c(2) * i2d : pos; // backward handle
- npos = b[1].code == NR_CURVETO ? b[1].c(1) * i2d : pos; // forward handle
- // Determine whether a node is at a smooth part of the path, by
- // calculating a measure for the collinearity of the handles
- bool c1 = fabs (Inkscape::Util::triangle_area (pos, ppos, npos)) < 1; // points are (almost) collinear
- bool c2 = NR::L2(pos - ppos) < 1e-6 || NR::L2(pos - npos) < 1e-6; // endnode, or a node with a retracted handle
- if (!(c1 & !c2)) {
- *p = pos; // only return non-smooth nodes ("cusps")
- }
+
+ Geom::PathVector const &pathv = shape->curve->get_pathvector();
+ if (pathv.empty())
+ return;
+
+ Geom::Matrix const i2d (sp_item_i2d_affine (item));
+
+ for(Geom::PathVector::const_iterator path_it = pathv.begin(); path_it != pathv.end(); ++path_it) {
+ *p = from_2geom(path_it->initialPoint() * i2d);
+
+ 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. */
+
+ Geom::NodeType nodetype = Geom::get_nodetype(*curve_it1, *curve_it2);
+
+ // 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);
+ }
+
+ ++curve_it1;
+ ++curve_it2;
}
-
- b++;
}
}