![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/sp-shape.cpp b/src/sp-shape.cpp
index 5fee7cc4855f21ec8633227c22c22ec85cf607df..35364692b29b680a2841d79f42c801c945de3858 100644 (file)
--- a/src/sp-shape.cpp
+++ b/src/sp-shape.cpp
*
* Author:
* Lauris Kaplinski <lauris@kaplinski.com>
+ * Abhishek Sharma
*
* Copyright (C) 1999-2002 Lauris Kaplinski
* Copyright (C) 2000-2001 Ximian, Inc.
* Copyright (C) 2004 John Cliff
* Copyright (C) 2007-2008 Johan Engelen
+ * Copyright (C) 2010 Jon A. Cruz <jon@joncruz.org>
*
* 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 <2geom/rect.h>
#include <2geom/transforms.h>
#include <2geom/pathvector.h>
+#include <2geom/path-intersection.h>
+#include <2geom/exception.h>
#include "helper/geom.h"
+#include "helper/geom-nodetype.h"
#include <sigc++/functors/ptr_fun.h>
#include <sigc++/adaptors/bind.h>
#include "style.h"
#include "marker.h"
#include "sp-path.h"
-#include "prefs-utils.h"
+#include "preferences.h"
#include "attributes.h"
#include "live_effects/lpeobject.h"
#include "util/mathfns.h" // for triangle_area()
-#define noSHAPE_VERBOSE
-
-static void sp_shape_class_init (SPShapeClass *klass);
-static void sp_shape_init (SPShape *shape);
-static void sp_shape_finalize (GObject *object);
-
-static void sp_shape_build (SPObject * object, SPDocument * document, Inkscape::XML::Node * repr);
-static void sp_shape_release (SPObject *object);
+#include "splivarot.h" // for bounding box calculation
-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::Document *doc, Inkscape::XML::Node *repr, guint flags);
+#define noSHAPE_VERBOSE
-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 NRArenaItem *sp_shape_show (SPItem *item, NRArena *arena, unsigned int key, unsigned int flags);
-static void sp_shape_hide (SPItem *item, unsigned int key);
-static void sp_shape_snappoints (SPItem const *item, SnapPointsIter p);
-
-static void sp_shape_update_marker_view (SPShape *shape, NRArenaItem *ai);
-static SPLPEItemClass *parent_class;
+SPLPEItemClass * SPShapeClass::parent_class = 0;
/**
* Registers the SPShape class with Gdk and returns its type number.
*/
-GType
-sp_shape_get_type (void)
+GType SPShape::getType(void)
{
- static GType type = 0;
- if (!type) {
- GTypeInfo info = {
- sizeof (SPShapeClass),
- NULL, NULL,
- (GClassInitFunc) sp_shape_class_init,
- NULL, NULL,
- sizeof (SPShape),
- 16,
- (GInstanceInitFunc) sp_shape_init,
- NULL, /* value_table */
- };
- type = g_type_register_static (SP_TYPE_LPE_ITEM, "SPShape", &info, (GTypeFlags)0);
- }
- return type;
+ static GType type = 0;
+ if (!type) {
+ GTypeInfo info = {
+ sizeof (SPShapeClass),
+ NULL, NULL,
+ (GClassInitFunc) SPShapeClass::sp_shape_class_init,
+ NULL, NULL,
+ sizeof (SPShape),
+ 16,
+ (GInstanceInitFunc) sp_shape_init,
+ NULL, /* value_table */
+ };
+ type = g_type_register_static (SP_TYPE_LPE_ITEM, "SPShape", &info, (GTypeFlags)0);
+ }
+ return type;
}
/**
* Initializes a SPShapeClass object. Establishes the function pointers to the class'
* member routines in the class vtable, and sets pointers to parent classes.
*/
-static void
-sp_shape_class_init (SPShapeClass *klass)
+void SPShapeClass::sp_shape_class_init(SPShapeClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
SPObjectClass *sp_object_class = SP_OBJECT_CLASS(klass);
parent_class = (SPLPEItemClass *)g_type_class_peek_parent (klass);
- gobject_class->finalize = sp_shape_finalize;
+ gobject_class->finalize = SPShape::sp_shape_finalize;
- sp_object_class->build = sp_shape_build;
- sp_object_class->release = sp_shape_release;
- sp_object_class->set = sp_shape_set;
- sp_object_class->update = sp_shape_update;
- sp_object_class->modified = sp_shape_modified;
- sp_object_class->write = sp_shape_write;
+ sp_object_class->build = SPShape::sp_shape_build;
+ sp_object_class->release = SPShape::sp_shape_release;
+ sp_object_class->set = SPShape::sp_shape_set;
+ sp_object_class->update = SPShape::sp_shape_update;
+ sp_object_class->modified = SPShape::sp_shape_modified;
+ sp_object_class->write = SPShape::sp_shape_write;
- item_class->bbox = sp_shape_bbox;
- item_class->print = sp_shape_print;
- item_class->show = sp_shape_show;
- item_class->hide = sp_shape_hide;
- item_class->snappoints = sp_shape_snappoints;
+ item_class->bbox = SPShape::sp_shape_bbox;
+ item_class->print = sp_shape_print;
+ item_class->show = SPShape::sp_shape_show;
+ item_class->hide = SPShape::sp_shape_hide;
+ item_class->snappoints = SPShape::sp_shape_snappoints;
lpe_item_class->update_patheffect = NULL;
klass->set_shape = NULL;
/**
* Initializes an SPShape object.
*/
-static void
-sp_shape_init (SPShape *shape)
+void SPShape::sp_shape_init(SPShape *shape)
{
for ( int i = 0 ; i < SP_MARKER_LOC_QTY ; i++ ) {
new (&shape->release_connect[i]) sigc::connection();
new (&shape->modified_connect[i]) sigc::connection();
+ shape->marker[i] = NULL;
}
+ shape->curve = NULL;
}
-static void
-sp_shape_finalize (GObject *object)
+void SPShape::sp_shape_finalize(GObject *object)
{
SPShape *shape=(SPShape *)object;
shape->modified_connect[i].~connection();
}
- if (((GObjectClass *) (parent_class))->finalize) {
- (* ((GObjectClass *) (parent_class))->finalize)(object);
+ if (((GObjectClass *) (SPShapeClass::parent_class))->finalize) {
+ (* ((GObjectClass *) (SPShapeClass::parent_class))->finalize)(object);
}
}
*
* \see sp_object_build()
*/
-static void
-sp_shape_build (SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
+void SPShape::sp_shape_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
{
- if (((SPObjectClass *) (parent_class))->build) {
- (*((SPObjectClass *) (parent_class))->build) (object, document, repr);
+ if (((SPObjectClass *) (SPShapeClass::parent_class))->build) {
+ (*((SPObjectClass *) (SPShapeClass::parent_class))->build) (object, document, repr);
}
+
+ for (int i = 0 ; i < SP_MARKER_LOC_QTY ; i++) {
+ sp_shape_set_marker (object, i, object->style->marker[i].value);
+ }
}
/**
@@ -183,403 +172,123 @@ sp_shape_build (SPObject *object, SPDocument *document, Inkscape::XML::Node *rep
*
* \see sp_object_release()
*/
-static void
-sp_shape_release (SPObject *object)
+void SPShape::sp_shape_release(SPObject *object)
{
- SPItem *item;
- SPShape *shape;
- SPItemView *v;
- int i;
-
- item = (SPItem *) object;
- shape = (SPShape *) object;
-
- for (i=SP_MARKER_LOC_START; i<SP_MARKER_LOC_QTY; i++) {
- if (shape->marker[i]) {
- sp_signal_disconnect_by_data (shape->marker[i], object);
- for (v = item->display; v != NULL; v = v->next) {
- sp_marker_hide ((SPMarker *) shape->marker[i], NR_ARENA_ITEM_GET_KEY (v->arenaitem) + i);
- }
- shape->marker[i] = sp_object_hunref (shape->marker[i], object);
- }
- }
- if (shape->curve) {
- shape->curve = shape->curve->unref();
- }
-
- if (((SPObjectClass *) parent_class)->release) {
- ((SPObjectClass *) parent_class)->release (object);
- }
+ SPItem *item;
+ SPShape *shape;
+ SPItemView *v;
+ int i;
+
+ item = (SPItem *) object;
+ shape = (SPShape *) object;
+
+ for (i = 0; i < SP_MARKER_LOC_QTY; i++) {
+ if (shape->marker[i]) {
+ for (v = item->display; v != NULL; v = v->next) {
+ sp_marker_hide ((SPMarker *) shape->marker[i], NR_ARENA_ITEM_GET_KEY (v->arenaitem) + i);
+ }
+ shape->release_connect[i].disconnect();
+ shape->modified_connect[i].disconnect();
+ shape->marker[i] = sp_object_hunref (shape->marker[i], object);
+ }
+ }
+ if (shape->curve) {
+ shape->curve = shape->curve->unref();
+ }
+
+ if (((SPObjectClass *) SPShapeClass::parent_class)->release) {
+ ((SPObjectClass *) SPShapeClass::parent_class)->release (object);
+ }
}
-static void
-sp_shape_set(SPObject *object, unsigned int key, gchar const *value)
+void SPShape::sp_shape_set(SPObject *object, unsigned int key, gchar const *value)
{
- if (((SPObjectClass *) parent_class)->set) {
- ((SPObjectClass *) parent_class)->set(object, key, value);
+ if (((SPObjectClass *) SPShapeClass::parent_class)->set) {
+ ((SPObjectClass *) SPShapeClass::parent_class)->set(object, key, value);
}
}
-static Inkscape::XML::Node *
-sp_shape_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags)
+Inkscape::XML::Node * SPShape::sp_shape_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags)
{
- if (((SPObjectClass *)(parent_class))->write) {
- ((SPObjectClass *)(parent_class))->write(object, doc, repr, flags);
+ if (((SPObjectClass *)(SPShapeClass::parent_class))->write) {
+ ((SPObjectClass *)(SPShapeClass::parent_class))->write(object, doc, repr, flags);
}
return repr;
}
-/**
+/**
* Updates the shape when its attributes have changed. Also establishes
- * marker objects to match the style settings.
+ * marker objects to match the style settings.
*/
-static void
-sp_shape_update (SPObject *object, SPCtx *ctx, unsigned int flags)
+void SPShape::sp_shape_update(SPObject *object, SPCtx *ctx, unsigned int flags)
{
SPItem *item = (SPItem *) object;
SPShape *shape = (SPShape *) object;
- if (((SPObjectClass *) (parent_class))->update) {
- (* ((SPObjectClass *) (parent_class))->update) (object, ctx, flags);
- }
-
- /* This stanza checks that an object's marker style agrees with
- * the marker objects it has allocated. sp_shape_set_marker ensures
- * that the appropriate marker objects are present (or absent) to
- * match the style.
- */
- /* TODO: It would be nice if this could be done at an earlier level */
- for (int i = 0 ; i < SP_MARKER_LOC_QTY ; i++) {
- sp_shape_set_marker (object, i, object->style->marker[i].value);
- }
-
- if (flags & (SP_OBJECT_STYLE_MODIFIED_FLAG | SP_OBJECT_VIEWPORT_MODIFIED_FLAG)) {
- SPStyle *style;
- style = SP_OBJECT_STYLE (object);
- if (style->stroke_width.unit == SP_CSS_UNIT_PERCENT) {
- SPItemCtx *ictx = (SPItemCtx *) ctx;
- double const aw = 1.0 / NR::expansion(ictx->i2vp);
- style->stroke_width.computed = style->stroke_width.value * aw;
- for (SPItemView *v = ((SPItem *) (shape))->display; v != NULL; v = v->next) {
- nr_arena_shape_set_style ((NRArenaShape *) v->arenaitem, style);
- }
- }
- }
-
- 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());
- 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) {
- nr_arena_shape_set_path(s, shape->curve, (flags & SP_OBJECT_USER_MODIFIED_FLAG_B));
- }
- if (paintbox) {
- s->setPaintBox(*paintbox);
- }
- }
- }
-
- if (sp_shape_has_markers (shape)) {
-
- /* Dimension marker views */
- for (SPItemView *v = item->display; v != NULL; v = v->next) {
-
- if (!v->arenaitem->key) {
- /* Get enough keys for all, start, mid and end marker types,
- ** and set this view's arenaitem key to the first of these keys.
- */
- NR_ARENA_ITEM_SET_KEY (
- v->arenaitem,
- sp_item_display_key_new (SP_MARKER_LOC_QTY)
- );
- }
-
- for (int i = 0 ; i < SP_MARKER_LOC_QTY ; i++) {
- if (shape->marker[i]) {
- sp_marker_show_dimension ((SPMarker *) shape->marker[i],
- NR_ARENA_ITEM_GET_KEY (v->arenaitem) + i - SP_MARKER_LOC,
- sp_shape_number_of_markers (shape, i));
- }
- }
- }
-
- /* Update marker views */
- for (SPItemView *v = item->display; v != NULL; v = v->next) {
- sp_shape_update_marker_view (shape, v->arenaitem);
- }
- }
-}
-
-
-/**
-* 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;
+ if (((SPObjectClass *) (SPShapeClass::parent_class))->update) {
+ (* ((SPObjectClass *) (SPShapeClass::parent_class))->update) (object, ctx, flags);
}
- 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;
+ /* This stanza checks that an object's marker style agrees with
+ * the marker objects it has allocated. sp_shape_set_marker ensures
+ * that the appropriate marker objects are present (or absent) to
+ * match the style.
+ */
+ for (int i = 0 ; i < SP_MARKER_LOC_QTY ; i++) {
+ sp_shape_set_marker (object, i, object->style->marker[i].value);
+ }
+
+ if (flags & (SP_OBJECT_STYLE_MODIFIED_FLAG | SP_OBJECT_VIEWPORT_MODIFIED_FLAG)) {
+ SPStyle *style;
+ style = SP_OBJECT_STYLE (object);
+ if (style->stroke_width.unit == SP_CSS_UNIT_PERCENT) {
+ SPItemCtx *ictx = (SPItemCtx *) ctx;
+ double const aw = 1.0 / NR::expansion(ictx->i2vp);
+ style->stroke_width.computed = style->stroke_width.value * aw;
+ for (SPItemView *v = ((SPItem *) (shape))->display; v != NULL; v = v->next) {
+ nr_arena_shape_set_style ((NRArenaShape *) v->arenaitem, style);
+ }
}
}
-}
-
-
-/* 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.)
- */
+ 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 */
+ Geom::OptRect paintbox = SP_ITEM(object)->getBounds(Geom::identity(), SPItem::GEOMETRIC_BBOX);
+ 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) {
+ nr_arena_shape_set_path(s, shape->curve, (flags & SP_OBJECT_USER_MODIFIED_FLAG_B));
+ }
+ if (paintbox) {
+ s->setPaintBox(*paintbox);
+ }
}
}
-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;
+ if (shape->hasMarkers ()) {
+ /* Dimension marker views */
+ for (SPItemView *v = item->display; v != NULL; v = v->next) {
+ if (!v->arenaitem->key) {
+ NR_ARENA_ITEM_SET_KEY (v->arenaitem, SPItem::display_key_new (SP_MARKER_LOC_QTY));
+ }
+ for (int i = 0 ; i < SP_MARKER_LOC_QTY ; i++) {
+ if (shape->marker[i]) {
+ sp_marker_show_dimension ((SPMarker *) shape->marker[i],
+ NR_ARENA_ITEM_GET_KEY (v->arenaitem) + i,
+ shape->numberOfMarkers (i));
}
- 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;
+ /* Update marker views */
+ for (SPItemView *v = item->display; v != NULL; v = v->next) {
+ sp_shape_update_marker_view (shape, v->arenaitem);
}
}
-
-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));
}
/**
*
* \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)
+Geom::Matrix 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);
@@ -621,68 +334,152 @@ 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::Matrix ret = Geom::Translate(p);
+
+ if ( !c.isDegenerate() ) {
+ Geom::Point tang = c.unitTangentAt(0);
+ double const angle = Geom::atan2(tang);
+ ret = Geom::Rotate(angle) * Geom::Translate(p);
+ } else {
+ /* FIXME: the svg spec says to search for a better alternative than zero angle directionality:
+ * http://www.w3.org/TR/SVG11/implnote.html#PathElementImplementationNotes */
+ }
+
+ return ret;
+}
+
+Geom::Matrix sp_shape_marker_get_transform_at_end(Geom::Curve const & c)
+{
+ Geom::Point p = c.pointAt(1);
+ Geom::Matrix ret = Geom::Translate(p);
+
+ if ( !c.isDegenerate() ) {
+ Geom::Curve * c_reverse = c.reverse();
+ Geom::Point tang = - c_reverse->unitTangentAt(0);
+ delete c_reverse;
+ double const angle = Geom::atan2(tang);
+ ret = Geom::Rotate(angle) * Geom::Translate(p);
+ } else {
+ /* FIXME: the svg spec says to search for a better alternative than zero angle directionality:
+ * http://www.w3.org/TR/SVG11/implnote.html#PathElementImplementationNotes */
+ }
+
+ return ret;
+}
+
/**
* 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.
+ * @todo figure out what to do when both 'marker' and for instance 'marker-end' are set.
*/
-static void
-sp_shape_update_marker_view (SPShape *shape, NRArenaItem *ai)
+void SPShape::sp_shape_update_marker_view(SPShape *shape, NRArenaItem *ai)
{
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;
+ int counter[4] = {0};
+ if (!shape->curve) return;
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));
- 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++;
+ if (pathv.empty()) return;
+
+ // the first vertex should get a start marker, the last an end marker, and all the others a mid marker
+ // see bug 456148
+
+ // START marker
+ {
+ Geom::Matrix const m (sp_shape_marker_get_transform_at_start(pathv.begin()->front()));
+ for (int i = 0; i < 2; i++) { // SP_MARKER_LOC and SP_MARKER_LOC_START
+ if ( shape->marker[i] ) {
+ sp_marker_show_instance ((SPMarker* ) shape->marker[i], ai,
+ NR_ARENA_ITEM_GET_KEY(ai) + i, counter[i], m,
+ style->stroke_width.computed);
+ counter[i]++;
+ }
}
+ }
- 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())
+ // MID marker
+ if (shape->marker[SP_MARKER_LOC_MID] || shape->marker[SP_MARKER_LOC]) {
+ for(Geom::PathVector::const_iterator path_it = pathv.begin(); path_it != pathv.end(); ++path_it) {
+ // START position
+ if ( path_it != pathv.begin()
+ && ! ((path_it == (pathv.end()-1)) && (path_it->size_default() == 0)) ) // if this is the last path and it is a moveto-only, don't draw mid marker there
{
- /* 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::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));
- 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++;
+ Geom::Matrix const m (sp_shape_marker_get_transform_at_start(path_it->front()));
+ for (int i = 0; i < 3; i += 2) { // SP_MARKER_LOC and SP_MARKER_LOC_MID
+ if ( shape->marker[i] ) {
+ sp_marker_show_instance ((SPMarker* ) shape->marker[i], ai,
+ NR_ARENA_ITEM_GET_KEY(ai) + i, counter[i], m,
+ style->stroke_width.computed);
+ counter[i]++;
+ }
+ }
+ }
+ // MID position
+ if ( path_it->size_default() > 1) {
+ 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));
+ for (int i = 0; i < 3; i += 2) { // SP_MARKER_LOC and SP_MARKER_LOC_MID
+ if (shape->marker[i]) {
+ sp_marker_show_instance ((SPMarker* ) shape->marker[i], ai,
+ NR_ARENA_ITEM_GET_KEY(ai) + i, counter[i], m,
+ style->stroke_width.computed);
+ counter[i]++;
+ }
+ }
- ++curve_it1;
- ++curve_it2;
+ ++curve_it1;
+ ++curve_it2;
+ }
+ }
+ // END position
+ if ( path_it != (pathv.end()-1) && !path_it->empty()) {
+ Geom::Curve const &lastcurve = path_it->back_default();
+ Geom::Matrix const m = sp_shape_marker_get_transform_at_end(lastcurve);
+ for (int i = 0; i < 3; i += 2) { // SP_MARKER_LOC and SP_MARKER_LOC_MID
+ if (shape->marker[i]) {
+ sp_marker_show_instance ((SPMarker* ) shape->marker[i], ai,
+ NR_ARENA_ITEM_GET_KEY(ai) + i, counter[i], m,
+ style->stroke_width.computed);
+ counter[i]++;
+ }
+ }
}
}
+ }
- 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));
- 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++;
+ // END marker
+ if ( shape->marker[SP_MARKER_LOC_END] || shape->marker[SP_MARKER_LOC] ) {
+ /* Get reference to last curve in the path.
+ * For moveto-only path, this returns the "closing line segment". */
+ Geom::Path const &path_last = pathv.back();
+ unsigned int index = path_last.size_default();
+ if (index > 0) {
+ index--;
+ }
+ Geom::Curve const &lastcurve = path_last[index];
+ Geom::Matrix const m = sp_shape_marker_get_transform_at_end(lastcurve);
+
+ for (int i = 0; i < 4; i += 3) { // SP_MARKER_LOC and SP_MARKER_LOC_END
+ if (shape->marker[i]) {
+ sp_marker_show_instance ((SPMarker* ) shape->marker[i], ai,
+ NR_ARENA_ITEM_GET_KEY(ai) + i, counter[i], m,
+ style->stroke_width.computed);
+ counter[i]++;
+ }
}
}
}
/**
* Sets modified flag for all sub-item views.
*/
-static void
-sp_shape_modified (SPObject *object, unsigned int flags)
+void SPShape::sp_shape_modified(SPObject *object, unsigned int flags)
{
- SPShape *shape = SP_SHAPE (object);
+ SPShape *shape = SP_SHAPE (object);
- if (((SPObjectClass *) (parent_class))->modified) {
- (* ((SPObjectClass *) (parent_class))->modified) (object, flags);
- }
+ if (((SPObjectClass *) (SPShapeClass::parent_class))->modified) {
+ (* ((SPObjectClass *) (SPShapeClass::parent_class))->modified) (object, flags);
+ }
- if (flags & SP_OBJECT_STYLE_MODIFIED_FLAG) {
- for (SPItemView *v = SP_ITEM (shape)->display; v != NULL; v = v->next) {
- nr_arena_shape_set_style (NR_ARENA_SHAPE (v->arenaitem), object->style);
- }
- }
+ if (flags & SP_OBJECT_STYLE_MODIFIED_FLAG) {
+ for (SPItemView *v = SP_ITEM (shape)->display; v != NULL; v = v->next) {
+ nr_arena_shape_set_style (NR_ARENA_SHAPE (v->arenaitem), object->style);
+ }
+ }
}
/**
* Calculates the bounding box for item, storing it into bbox.
* This also includes the bounding boxes of any markers included in the shape.
*/
-static void sp_shape_bbox(SPItem const *item, NRRect *bbox, NR::Matrix const &transform, unsigned const flags)
+void SPShape::sp_shape_bbox(SPItem const *item, NRRect *bbox, Geom::Matrix const &transform, unsigned const flags)
{
SPShape const *shape = SP_SHAPE (item);
-
if (shape->curve) {
-
- NRRect 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) {
-
- SPStyle* style=SP_OBJECT_STYLE (item);
- if (!style->stroke.isNone()) {
- double const scale = expansion(transform);
- if ( fabs(style->stroke_width.computed * scale) > 0.01 ) { // sinon c'est 0=oon veut pas de bord
- double const width = MAX(0.125, style->stroke_width.computed * scale);
- if ( fabs(cbbox.x1-cbbox.x0) > -0.00001 && fabs(cbbox.y1-cbbox.y0) > -0.00001 ) {
- cbbox.x0-=0.5*width;
- cbbox.x1+=0.5*width;
- cbbox.y0-=0.5*width;
- cbbox.y1+=0.5*width;
- }
+ Geom::OptRect geombbox = bounds_exact_transformed(shape->curve->get_pathvector(), transform);
+ if (geombbox) {
+ NRRect cbbox;
+ cbbox.x0 = (*geombbox)[0][0];
+ cbbox.y0 = (*geombbox)[1][0];
+ cbbox.x1 = (*geombbox)[0][1];
+ cbbox.y1 = (*geombbox)[1][1];
+
+ switch ((SPItem::BBoxType) flags) {
+ case SPItem::GEOMETRIC_BBOX: {
+ // do nothing
+ break;
}
- }
-
- // Union with bboxes of the markers, if any
- if (sp_shape_has_markers (shape)) {
- /* 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]));
-
- Geom::Point p = path_it->front().pointAt(0);
- Geom::Point tang = path_it->front().unitTangentAt(0);
- NR::Matrix tr(from_2geom(sp_shape_marker_get_transform(p, tang, tang)));
-
- if (marker->markerUnits == SP_MARKER_UNITS_STROKEWIDTH) {
- tr = NR::scale(style->stroke_width.computed) * tr;
+ case SPItem::RENDERING_BBOX: {
+ // convert the stroke to a path and calculate that path's geometric bbox
+ SPStyle* style=SP_OBJECT_STYLE (item);
+ if (!style->stroke.isNone()) {
+ Geom::PathVector *pathv = item_outline(item);
+ if (pathv) {
+ Geom::OptRect geomstrokebbox = bounds_exact_transformed(*pathv, transform);
+ if (geomstrokebbox) {
+ NRRect strokebbox;
+ strokebbox.x0 = (*geomstrokebbox)[0][0];
+ strokebbox.y0 = (*geomstrokebbox)[1][0];
+ strokebbox.x1 = (*geomstrokebbox)[0][1];
+ strokebbox.y1 = (*geomstrokebbox)[1][1];
+ nr_rect_d_union (&cbbox, &cbbox, &strokebbox);
+ }
+ delete pathv;
}
-
- // 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]));
-
- Geom::Point p = curve_it1->pointAt(1);
- Geom::Point tang1 = curve_it1->unitTangentAt(1);
- Geom::Point tang2 = curve_it2->unitTangentAt(0);
- NR::Matrix tr(from_2geom(sp_shape_marker_get_transform(p, tang1, tang2)));
-
- if (marker->markerUnits == SP_MARKER_UNITS_STROKEWIDTH) {
- tr = NR::scale(style->stroke_width.computed) * tr;
+ break;
+ }
+ default:
+ case SPItem::APPROXIMATE_BBOX: {
+ SPStyle* style=SP_OBJECT_STYLE (item);
+ if (!style->stroke.isNone()) {
+ double const scale = transform.descrim();
+ if ( fabs(style->stroke_width.computed * scale) > 0.01 ) { // sinon c'est 0=oon veut pas de bord
+ double const width = MAX(0.125, style->stroke_width.computed * scale);
+ if ( fabs(cbbox.x1-cbbox.x0) > -0.00001 && fabs(cbbox.y1-cbbox.y0) > -0.00001 ) {
+ cbbox.x0-=0.5*width;
+ cbbox.x1+=0.5*width;
+ cbbox.y0-=0.5*width;
+ cbbox.y1+=0.5*width;
}
-
- // 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);
-
- ++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]));
-
- Geom::Point p = path_it->back_default().pointAt(1);
- Geom::Point tang = path_it->back_default().unitTangentAt(1);
- NR::Matrix tr(from_2geom(sp_shape_marker_get_transform(p, tang, tang)));
-
- if (marker->markerUnits == SP_MARKER_UNITS_STROKEWIDTH) {
- tr = NR::scale(style->stroke_width.computed) * tr;
+ // Union with bboxes of the markers, if any
+ if ( shape->hasMarkers() && !shape->curve->get_pathvector().empty() ) {
+ /** \todo make code prettier! */
+ Geom::PathVector const & pathv = shape->curve->get_pathvector();
+ // START marker
+ for (unsigned i = 0; i < 2; i++) { // SP_MARKER_LOC and SP_MARKER_LOC_START
+ if ( shape->marker[i] ) {
+ SPMarker* marker = SP_MARKER (shape->marker[i]);
+ SPItem* marker_item = sp_item_first_item_child (SP_OBJECT (marker));
+
+ if (marker_item) {
+ Geom::Matrix tr(sp_shape_marker_get_transform_at_start(pathv.begin()->front()));
+ if (!marker->orient_auto) {
+ Geom::Point transl = tr.translation();
+ tr = Geom::Rotate::from_degrees(marker->orient) * Geom::Translate(transl);
+ }
+ if (marker->markerUnits == SP_MARKER_UNITS_STROKEWIDTH) {
+ tr = Geom::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;
+ marker_item->invoke_bbox ( &marker_bbox, from_2geom(tr), true);
+ // union it with the shape bbox
+ nr_rect_d_union (&cbbox, &cbbox, &marker_bbox);
+ }
+ }
+ }
+ // MID marker
+ for (unsigned i = 0; i < 3; i += 2) { // SP_MARKER_LOC and SP_MARKER_LOC_MID
+ SPMarker* marker = SP_MARKER (shape->marker[i]);
+ if ( !shape->marker[i] ) continue;
+ SPItem* marker_item = sp_item_first_item_child (SP_OBJECT (marker));
+ if ( !marker_item ) continue;
+
+ for(Geom::PathVector::const_iterator path_it = pathv.begin(); path_it != pathv.end(); ++path_it) {
+ // START position
+ if ( path_it != pathv.begin()
+ && ! ((path_it == (pathv.end()-1)) && (path_it->size_default() == 0)) ) // if this is the last path and it is a moveto-only, there is no mid marker there
+ {
+ Geom::Matrix tr(sp_shape_marker_get_transform_at_start(path_it->front()));
+ if (!marker->orient_auto) {
+ Geom::Point transl = tr.translation();
+ tr = Geom::Rotate::from_degrees(marker->orient) * Geom::Translate(transl);
+ }
+ if (marker->markerUnits == SP_MARKER_UNITS_STROKEWIDTH) {
+ tr = Geom::Scale(style->stroke_width.computed) * tr;
+ }
+ tr = marker_item->transform * marker->c2p * tr * transform;
+ NRRect marker_bbox;
+ marker_item->invoke_bbox ( &marker_bbox, from_2geom(tr), true);
+ nr_rect_d_union (&cbbox, &cbbox, &marker_bbox);
+ }
+ // MID position
+ if ( path_it->size_default() > 1) {
+ 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[i]);
+ SPItem* marker_item = sp_item_first_item_child (SP_OBJECT (marker));
+
+ if (marker_item) {
+ Geom::Matrix tr(sp_shape_marker_get_transform(*curve_it1, *curve_it2));
+ if (!marker->orient_auto) {
+ Geom::Point transl = tr.translation();
+ tr = Geom::Rotate::from_degrees(marker->orient) * Geom::Translate(transl);
+ }
+ if (marker->markerUnits == SP_MARKER_UNITS_STROKEWIDTH) {
+ tr = Geom::Scale(style->stroke_width.computed) * tr;
+ }
+ tr = marker_item->transform * marker->c2p * tr * transform;
+ NRRect marker_bbox;
+ marker_item->invoke_bbox ( &marker_bbox, from_2geom(tr), true);
+ nr_rect_d_union (&cbbox, &cbbox, &marker_bbox);
+ }
+
+ ++curve_it1;
+ ++curve_it2;
+ }
+ }
+ // END position
+ if ( path_it != (pathv.end()-1) && !path_it->empty()) {
+ Geom::Curve const &lastcurve = path_it->back_default();
+ Geom::Matrix tr = sp_shape_marker_get_transform_at_end(lastcurve);
+ if (!marker->orient_auto) {
+ Geom::Point transl = tr.translation();
+ tr = Geom::Rotate::from_degrees(marker->orient) * Geom::Translate(transl);
+ }
+ if (marker->markerUnits == SP_MARKER_UNITS_STROKEWIDTH) {
+ tr = Geom::Scale(style->stroke_width.computed) * tr;
+ }
+ tr = marker_item->transform * marker->c2p * tr * transform;
+ NRRect marker_bbox;
+ marker_item->invoke_bbox ( &marker_bbox, tr, true);
+ nr_rect_d_union (&cbbox, &cbbox, &marker_bbox);
+ }
+ }
+ }
+ // END marker
+ for (unsigned i = 0; i < 4; i += 3) { // SP_MARKER_LOC and SP_MARKER_LOC_END
+ if ( shape->marker[i] ) {
+ SPMarker* marker = SP_MARKER (shape->marker[i]);
+ SPItem* marker_item = sp_item_first_item_child (SP_OBJECT (marker));
+
+ if (marker_item) {
+ /* Get reference to last curve in the path.
+ * For moveto-only path, this returns the "closing line segment". */
+ Geom::Path const &path_last = pathv.back();
+ unsigned int index = path_last.size_default();
+ if (index > 0) {
+ index--;
+ }
+ Geom::Curve const &lastcurve = path_last[index];
+
+ Geom::Matrix tr = sp_shape_marker_get_transform_at_end(lastcurve);
+ if (!marker->orient_auto) {
+ Geom::Point transl = tr.translation();
+ tr = Geom::Rotate::from_degrees(marker->orient) * Geom::Translate(transl);
+ }
+ if (marker->markerUnits == SP_MARKER_UNITS_STROKEWIDTH) {
+ tr = Geom::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;
+ marker_item->invoke_bbox ( &marker_bbox, tr, true);
+ // union it with the shape bbox
+ nr_rect_d_union (&cbbox, &cbbox, &marker_bbox);
+ }
+ }
}
-
- // 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);
}
- }
- }
- }
+ break;
+ } // end case approximate bbox type
+ } // end switch bboxtype
- // copy our bbox to the variable we're given
- *bbox = cbbox;
+ // copy our bbox to the variable we're given
+ *bbox = cbbox;
+ }
}
}
+static void
+sp_shape_print_invoke_marker_printing(SPObject* obj, Geom::Matrix tr, SPStyle* style, SPPrintContext *ctx) {
+ SPMarker *marker = SP_MARKER(obj);
+ if (marker->markerUnits == SP_MARKER_UNITS_STROKEWIDTH) {
+ tr = Geom::Scale(style->stroke_width.computed) * tr;
+ }
+
+ SPItem* marker_item = sp_item_first_item_child (SP_OBJECT (marker));
+ tr = marker_item->transform * marker->c2p * tr;
+
+ Geom::Matrix old_tr = marker_item->transform;
+ marker_item->transform = tr;
+ marker_item->invoke_print (ctx);
+ marker_item->transform = old_tr;
+}
/**
* Prepares shape for printing. Handles printing of comments for printing
* debugging, sizes the item to fit into the document width/height,
@@ -841,13 +736,17 @@ static void sp_shape_bbox(SPItem const *item, NRRect *bbox, NR::Matrix const &tr
void
sp_shape_print (SPItem *item, SPPrintContext *ctx)
{
- NRRect pbox, dbox, bbox;
+ NRRect pbox, dbox, bbox;
- SPShape *shape = SP_SHAPE(item);
+ SPShape *shape = SP_SHAPE(item);
- if (!shape->curve) return;
+ if (!shape->curve) return;
+
+ Geom::PathVector const & pathv = shape->curve->get_pathvector();
+ if (pathv.empty()) return;
- gint add_comments = prefs_get_int_attribute_limited ("printing.debug", "add-label-comments", 0, 0, 1);
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ gint add_comments = prefs->getBool("/printing/debug/add-label-comments");
if (add_comments) {
gchar * comment = g_strdup_printf("begin '%s'",
SP_OBJECT(item)->defaultLabel());
g_free(comment);
}
- /* fixme: Think (Lauris) */
- sp_item_invoke_bbox(item, &pbox, NR::identity(), TRUE);
- dbox.x0 = 0.0;
- dbox.y0 = 0.0;
- 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 = from_2geom(sp_item_i2d_affine(item));
+ /* fixme: Think (Lauris) */
+ item->invoke_bbox( &pbox, Geom::identity(), TRUE);
+ dbox.x0 = 0.0;
+ dbox.y0 = 0.0;
+ dbox.x1 = SP_OBJECT_DOCUMENT (item)->getWidth ();
+ dbox.y1 = SP_OBJECT_DOCUMENT (item)->getHeight ();
+ item->getBboxDesktop (&bbox);
+ Geom::Matrix const i2d(item->i2d_affine());
- SPStyle* style = SP_OBJECT_STYLE (item);
+ 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, pathv, &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, pathv, &i2d, style, &pbox, &dbox, &bbox);
}
- /* 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]));
-
- Geom::Point p = path_it->front().pointAt(0);
- Geom::Point tang = path_it->front().unitTangentAt(0);
- NR::Matrix tr(from_2geom(sp_shape_marker_get_transform(p, tang, tang)));
-
- 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;
+ /** \todo make code prettier */
+ // START marker
+ for (int i = 0; i < 2; i++) { // SP_MARKER_LOC and SP_MARKER_LOC_START
+ if ( shape->marker[i] ) {
+ Geom::Matrix tr(sp_shape_marker_get_transform_at_start(pathv.begin()->front()));
+ sp_shape_print_invoke_marker_printing(shape->marker[i], tr, style, ctx);
}
-
- 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]));
-
- Geom::Point p = curve_it1->pointAt(1);
- Geom::Point tang1 = curve_it1->unitTangentAt(1);
- Geom::Point tang2 = curve_it2->unitTangentAt(0);
- NR::Matrix tr(from_2geom(sp_shape_marker_get_transform(p, tang1, tang2)));
-
- if (marker->markerUnits == SP_MARKER_UNITS_STROKEWIDTH) {
- tr = NR::scale(style->stroke_width.computed) * tr;
+ }
+ // MID marker
+ for (int i = 0; i < 3; i += 2) { // SP_MARKER_LOC and SP_MARKER_LOC_MID
+ if (shape->marker[i]) {
+ for(Geom::PathVector::const_iterator path_it = pathv.begin(); path_it != pathv.end(); ++path_it) {
+ // START position
+ if ( path_it != pathv.begin()
+ && ! ((path_it == (pathv.end()-1)) && (path_it->size_default() == 0)) ) // if this is the last path and it is a moveto-only, there is no mid marker there
+ {
+ Geom::Matrix tr(sp_shape_marker_get_transform_at_start(path_it->front()));
+ sp_shape_print_invoke_marker_printing(shape->marker[i], tr, style, ctx);
+ }
+ // MID position
+ if ( path_it->size_default() > 1) {
+ 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 tr(sp_shape_marker_get_transform(*curve_it1, *curve_it2));
+
+ sp_shape_print_invoke_marker_printing(shape->marker[i], tr, style, ctx);
+
+ ++curve_it1;
+ ++curve_it2;
+ }
+ }
+ if ( path_it != (pathv.end()-1) && !path_it->empty()) {
+ Geom::Curve const &lastcurve = path_it->back_default();
+ Geom::Matrix tr = sp_shape_marker_get_transform_at_end(lastcurve);
+ sp_shape_print_invoke_marker_printing(shape->marker[i], tr, style, ctx);
}
-
- 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;
}
}
+ }
+ // END marker
+ if ( shape->marker[SP_MARKER_LOC_END] || shape->marker[SP_MARKER_LOC]) {
+ /* Get reference to last curve in the path.
+ * For moveto-only path, this returns the "closing line segment". */
+ Geom::Path const &path_last = pathv.back();
+ unsigned int index = path_last.size_default();
+ if (index > 0) {
+ index--;
+ }
+ Geom::Curve const &lastcurve = path_last[index];
- 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]));
-
- Geom::Point p = path_it->back_default().pointAt(1);
- Geom::Point tang = path_it->back_default().unitTangentAt(1);
- NR::Matrix tr(from_2geom(sp_shape_marker_get_transform(p, tang, tang)));
+ Geom::Matrix tr = sp_shape_marker_get_transform_at_end(lastcurve);
- if (marker->markerUnits == SP_MARKER_UNITS_STROKEWIDTH) {
- tr = NR::scale(style->stroke_width.computed) * tr;
+ for (int i = 0; i < 4; i += 3) { // SP_MARKER_LOC and SP_MARKER_LOC_END
+ if (shape->marker[i]) {
+ sp_shape_print_invoke_marker_printing(shape->marker[i], tr, style, ctx);
}
-
- 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;
}
}
/**
* Sets style, path, and paintbox. Updates marker views, including dimensions.
*/
-static NRArenaItem *
-sp_shape_show (SPItem *item, NRArena *arena, unsigned int /*key*/, unsigned int /*flags*/)
+NRArenaItem * SPShape::sp_shape_show(SPItem *item, NRArena *arena, unsigned int /*key*/, unsigned int /*flags*/)
{
- SPObject *object = SP_OBJECT(item);
- SPShape *shape = SP_SHAPE(item);
-
- NRArenaItem *arenaitem = NRArenaShape::create(arena);
- 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());
- if (paintbox) {
- s->setPaintBox(*paintbox);
- }
+ SPObject *object = SP_OBJECT(item);
+ SPShape *shape = SP_SHAPE(item);
+
+ NRArenaItem *arenaitem = NRArenaShape::create(arena);
+ NRArenaShape * const s = NR_ARENA_SHAPE(arenaitem);
+ nr_arena_shape_set_style(s, object->style);
+ nr_arena_shape_set_path(s, shape->curve, false);
+ Geom::OptRect paintbox = item->getBounds(Geom::identity());
+ if (paintbox) {
+ s->setPaintBox(*paintbox);
+ }
- if (sp_shape_has_markers (shape)) {
+ /* This stanza checks that an object's marker style agrees with
+ * the marker objects it has allocated. sp_shape_set_marker ensures
+ * that the appropriate marker objects are present (or absent) to
+ * match the style.
+ */
+ for (int i = 0 ; i < SP_MARKER_LOC_QTY ; i++) {
+ sp_shape_set_marker (object, i, object->style->marker[i].value);
+ }
- /* Dimension the marker views */
- if (!arenaitem->key) {
- NR_ARENA_ITEM_SET_KEY (arenaitem, sp_item_display_key_new (SP_MARKER_LOC_QTY));
- }
+ if (shape->hasMarkers ()) {
- for (int i = 0; i < SP_MARKER_LOC_QTY; i++) {
- if (shape->marker[i]) {
- sp_marker_show_dimension ((SPMarker *) shape->marker[i],
- NR_ARENA_ITEM_GET_KEY (arenaitem) + i - SP_MARKER_LOC,
- sp_shape_number_of_markers (shape, i));
- }
- }
+ /* provide key and dimension the marker views */
+ if (!arenaitem->key) {
+ NR_ARENA_ITEM_SET_KEY (arenaitem, SPItem::display_key_new (SP_MARKER_LOC_QTY));
+ }
+ for (int i = 0; i < SP_MARKER_LOC_QTY; i++) {
+ if (shape->marker[i]) {
+ sp_marker_show_dimension ((SPMarker *) shape->marker[i],
+ NR_ARENA_ITEM_GET_KEY (arenaitem) + i,
+ shape->numberOfMarkers (i));
+ }
+ }
- /* Update marker views */
- sp_shape_update_marker_view (shape, arenaitem);
- }
+ /* Update marker views */
+ sp_shape_update_marker_view (shape, arenaitem);
+ }
- return arenaitem;
+ return arenaitem;
}
/**
* Hides/removes marker views from the shape.
*/
-static void
-sp_shape_hide (SPItem *item, unsigned int key)
+void SPShape::sp_shape_hide(SPItem *item, unsigned int key)
{
- SPShape *shape;
- SPItemView *v;
- int i;
+ SPShape *shape;
+ SPItemView *v;
+ int i;
- shape = (SPShape *) item;
+ shape = (SPShape *) item;
- for (i=0; i<SP_MARKER_LOC_QTY; i++) {
- if (shape->marker[i]) {
- for (v = item->display; v != NULL; v = v->next) {
+ for (i=0; i<SP_MARKER_LOC_QTY; i++) {
+ if (shape->marker[i]) {
+ for (v = item->display; v != NULL; v = v->next) {
if (key == v->key) {
- sp_marker_hide ((SPMarker *) shape->marker[i],
+ sp_marker_hide ((SPMarker *) shape->marker[i],
NR_ARENA_ITEM_GET_KEY (v->arenaitem) + i);
}
- }
- }
- }
+ }
+ }
+ }
- if (((SPItemClass *) parent_class)->hide) {
- ((SPItemClass *) parent_class)->hide (item, key);
- }
+ if (((SPItemClass *) SPShapeClass::parent_class)->hide) {
+ ((SPItemClass *) SPShapeClass::parent_class)->hide (item, key);
+ }
}
/**
* \param shape Shape.
* \return TRUE if the shape has any markers, or FALSE if not.
*/
-int
-sp_shape_has_markers (SPShape const *shape)
+int SPShape::hasMarkers() const
{
/* Note, we're ignoring 'marker' settings, which technically should apply for
all three settings. This should be fixed later such that if 'marker' is
specified, then all three should appear. */
return (
- shape->curve &&
- (shape->marker[SP_MARKER_LOC_START] ||
- shape->marker[SP_MARKER_LOC_MID] ||
- shape->marker[SP_MARKER_LOC_END])
+ this->curve &&
+ (this->marker[SP_MARKER_LOC] ||
+ this->marker[SP_MARKER_LOC_START] ||
+ this->marker[SP_MARKER_LOC_MID] ||
+ this->marker[SP_MARKER_LOC_END])
);
}
* \param type Marker type (e.g. SP_MARKER_LOC_START)
* \return Number of markers that the shape has of this type.
*/
-int
-sp_shape_number_of_markers (SPShape *shape, int type)
+int SPShape::numberOfMarkers(int type)
{
-// TODO fixme: this looks very bad that the type parameter is ignored.
- Geom::PathVector const & pathv = shape->curve->get_pathvector();
-
- guint n = shape->marker[SP_MARKER_LOC_START] ? pathv.size() : 0;
+ Geom::PathVector const & pathv = this->curve->get_pathvector();
+ if (pathv.size() == 0) {
+ return 0;
+ }
- for(Geom::PathVector::const_iterator path_it = pathv.begin(); path_it != pathv.end(); ++path_it) {
- n += shape->marker[SP_MARKER_LOC_MID] ? path_it->size() : 0;
+ switch(type) {
+ case SP_MARKER_LOC:
+ {
+ if ( this->marker[SP_MARKER_LOC] ) {
+ guint n = 0;
+ for(Geom::PathVector::const_iterator path_it = pathv.begin(); path_it != pathv.end(); ++path_it) {
+ n += path_it->size_default() + 1;
+ }
+ return n;
+ } else {
+ return 0;
+ }
+ }
+ case SP_MARKER_LOC_START:
+ // there is only a start marker on the first path of a pathvector
+ return this->marker[SP_MARKER_LOC_START] ? 1 : 0;
+
+ case SP_MARKER_LOC_MID:
+ {
+ if ( this->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_default() + 1;
+ }
+ return n - 2; // minus the start and end marker.
+ } else {
+ return 0;
+ }
+ }
- if ( shape->marker[SP_MARKER_LOC_END] && !path_it->empty()) {
- n++;
+ case SP_MARKER_LOC_END:
+ {
+ // there is only an end marker on the last path of a pathvector
+ return this->marker[SP_MARKER_LOC_END] ? 1 : 0;
}
- }
- return n;
+ default:
+ return 0;
+ }
}
/**
static void
sp_shape_marker_release (SPObject *marker, SPShape *shape)
{
- SPItem *item;
- int i;
-
- item = (SPItem *) shape;
-
- for (i = SP_MARKER_LOC_START; i < SP_MARKER_LOC_QTY; i++) {
- if (marker == shape->marker[i]) {
- SPItemView *v;
- /* Hide marker */
- for (v = item->display; v != NULL; v = v->next) {
- sp_marker_hide ((SPMarker *) (shape->marker[i]), NR_ARENA_ITEM_GET_KEY (v->arenaitem) + i);
- /* fixme: Do we need explicit remove here? (Lauris) */
- /* nr_arena_item_set_mask (v->arenaitem, NULL); */
- }
- /* Detach marker */
- sp_signal_disconnect_by_data (shape->marker[i], item);
- shape->marker[i] = sp_object_hunref (shape->marker[i], item);
- }
- }
+ SPItem *item;
+ int i;
+
+ item = (SPItem *) shape;
+
+ for (i = 0; i < SP_MARKER_LOC_QTY; i++) {
+ if (marker == shape->marker[i]) {
+ SPItemView *v;
+ /* Hide marker */
+ for (v = item->display; v != NULL; v = v->next) {
+ sp_marker_hide ((SPMarker *) (shape->marker[i]), NR_ARENA_ITEM_GET_KEY (v->arenaitem) + i);
+ /* fixme: Do we need explicit remove here? (Lauris) */
+ /* nr_arena_item_set_mask (v->arenaitem, NULL); */
+ }
+ /* Detach marker */
+ shape->release_connect[i].disconnect();
+ shape->modified_connect[i].disconnect();
+ shape->marker[i] = sp_object_hunref (shape->marker[i], item);
+ }
+ }
}
/**
static void
sp_shape_marker_modified (SPObject */*marker*/, guint /*flags*/, SPItem */*item*/)
{
- /* I think mask does update automagically */
- /* g_warning ("Item %s mask %s modified", SP_OBJECT_ID (item), SP_OBJECT_ID (mask)); */
+ /* I think mask does update automagically */
+ /* g_warning ("Item %s mask %s modified", item->getId(), mask->getId()); */
}
/**
- * Adds a new marker to shape object at the location indicated by key. value
+ * Adds a new marker to shape object at the location indicated by key. value
* must be a valid URI reference resolvable from the shape object (i.e., present
* in the document <defs>). If the shape object already has a marker
* registered at the given position, it is removed first. Then the
SPItem *item = (SPItem *) object;
SPShape *shape = (SPShape *) object;
- if (key < SP_MARKER_LOC_START || key > SP_MARKER_LOC_END) {
+ if (key > SP_MARKER_LOC_END) {
return;
}
@@ -1167,15 +1085,11 @@ sp_shape_set_marker (SPObject *object, unsigned int key, const gchar *value)
/**
* Calls any registered handlers for the set_shape action
*/
-void
-sp_shape_set_shape (SPShape *shape)
+void SPShape::setShape()
{
- g_return_if_fail (shape != NULL);
- g_return_if_fail (SP_IS_SHAPE (shape));
-
- if (SP_SHAPE_CLASS (G_OBJECT_GET_CLASS (shape))->set_shape) {
- SP_SHAPE_CLASS (G_OBJECT_GET_CLASS (shape))->set_shape (shape);
- }
+ if (SP_SHAPE_CLASS (G_OBJECT_GET_CLASS (this))->set_shape) {
+ SP_SHAPE_CLASS (G_OBJECT_GET_CLASS (this))->set_shape (this);
+ }
}
/**
* Any existing curve in the shape will be unreferenced first.
* This routine also triggers a request to update the display.
*/
-void
-sp_shape_set_curve (SPShape *shape, SPCurve *curve, unsigned int owner)
+void SPShape::setCurve(SPCurve *curve, unsigned int owner)
{
- if (shape->curve) {
- shape->curve = shape->curve->unref();
- }
- if (curve) {
- if (owner) {
- shape->curve = curve->ref();
- } else {
- shape->curve = curve->copy();
- }
- }
- SP_OBJECT(shape)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+ if (this->curve) {
+ this->curve = this->curve->unref();
+ }
+ if (curve) {
+ if (owner) {
+ this->curve = curve->ref();
+ } else {
+ this->curve = curve->copy();
+ }
+ }
+ SP_OBJECT(this)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
}
/**
* Return duplicate of curve (if any exists) or NULL if there is no curve
*/
-SPCurve *
-sp_shape_get_curve (SPShape *shape)
+SPCurve * SPShape::getCurve()
{
- if (shape->curve) {
- return shape->curve->copy();
- }
- return NULL;
+ if (this->curve) {
+ return this->curve->copy();
+ }
+ return NULL;
}
/**
* Same as sp_shape_set_curve but without updating the display
*/
-void
-sp_shape_set_curve_insync (SPShape *shape, SPCurve *curve, unsigned int owner)
+void SPShape::setCurveInsync(SPCurve *curve, unsigned int owner)
{
- if (shape->curve) {
- shape->curve = shape->curve->unref();
- }
- if (curve) {
- if (owner) {
- shape->curve = curve->ref();
- } else {
- shape->curve = curve->copy();
- }
- }
+ if (this->curve) {
+ this->curve = this->curve->unref();
+ }
+ if (curve) {
+ if (owner) {
+ this->curve = curve->ref();
+ } else {
+ this->curve = curve->copy();
+ }
+ }
}
/**
* Return all nodes in a path that are to be considered for snapping
*/
-static void sp_shape_snappoints(SPItem const *item, SnapPointsIter p)
+void SPShape::sp_shape_snappoints(SPItem const *item, std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs)
{
g_assert(item != NULL);
g_assert(SP_IS_SHAPE(item));
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")
+
+ // Help enforcing strict snapping, i.e. only return nodes when we're snapping nodes to nodes or a guide to nodes
+ if (!(snapprefs->getSnapModeNode() || snapprefs->getSnapModeGuide())) {
+ return;
+ }
+
+ Geom::PathVector const &pathv = shape->curve->get_pathvector();
+ if (pathv.empty())
+ return;
+
+ Geom::Matrix const i2d (item->i2d_affine ());
+
+ if (snapprefs->getSnapObjectMidpoints()) {
+ Geom::OptRect bbox = item->getBounds(item->i2d_affine());
+ if (bbox) {
+ p.push_back(Inkscape::SnapCandidatePoint(bbox->midpoint(), Inkscape::SNAPSOURCE_OBJECT_MIDPOINT, Inkscape::SNAPTARGET_OBJECT_MIDPOINT));
+ }
+ }
+
+ for(Geom::PathVector::const_iterator path_it = pathv.begin(); path_it != pathv.end(); ++path_it) {
+ if (snapprefs->getSnapToItemNode()) {
+ // Add the first point of the path
+ p.push_back(Inkscape::SnapCandidatePoint(path_it->initialPoint() * i2d, Inkscape::SNAPSOURCE_NODE_CUSP, Inkscape::SNAPTARGET_NODE_CUSP));
+ }
+
+ Geom::Path::const_iterator curve_it1 = path_it->begin(); // incoming curve
+ Geom::Path::const_iterator curve_it2 = ++(path_it->begin()); // outgoing curve
+ while (curve_it1 != path_it->end_default())
+ {
+ // For each path: consider midpoints of line segments for snapping
+ if (snapprefs->getSnapLineMidpoints()) { // only do this when we're snapping nodes (enforces strict snapping)
+ if (Geom::LineSegment const* line_segment = dynamic_cast<Geom::LineSegment const*>(&(*curve_it1))) {
+ p.push_back(Inkscape::SnapCandidatePoint(Geom::middle_point(*line_segment) * i2d, Inkscape::SNAPSOURCE_LINE_MIDPOINT, Inkscape::SNAPTARGET_LINE_MIDPOINT));
+ }
+ }
+
+ if (curve_it2 == path_it->end_default()) { // Test will only pass for the last iteration of the while loop
+ if (snapprefs->getSnapToItemNode() && !path_it->closed()) {
+ // Add the last point of the path, but only for open paths
+ // (for closed paths the first and last point will coincide)
+ p.push_back(Inkscape::SnapCandidatePoint((*curve_it1).finalPoint() * i2d, Inkscape::SNAPSOURCE_NODE_CUSP, Inkscape::SNAPTARGET_NODE_CUSP));
+ }
+ } else {
+ /* Test whether to add the node between curve_it1 and curve_it2.
+ * Loop to end_default (so only iterating through the stroked part); */
+
+ Geom::NodeType nodetype = Geom::get_nodetype(*curve_it1, *curve_it2);
+
+ bool c1 = snapprefs->getSnapToItemNode() && (nodetype == Geom::NODE_CUSP || nodetype == Geom::NODE_NONE);
+ bool c2 = snapprefs->getSnapSmoothNodes() && (nodetype == Geom::NODE_SMOOTH || nodetype == Geom::NODE_SYMM);
+
+ if (c1 || c2) {
+ Inkscape::SnapSourceType sst;
+ Inkscape::SnapTargetType stt;
+ switch (nodetype) {
+ case Geom::NODE_CUSP:
+ sst = Inkscape::SNAPSOURCE_NODE_CUSP;
+ stt = Inkscape::SNAPTARGET_NODE_CUSP;
+ break;
+ case Geom::NODE_SMOOTH:
+ case Geom::NODE_SYMM:
+ sst = Inkscape::SNAPSOURCE_NODE_SMOOTH;
+ stt = Inkscape::SNAPTARGET_NODE_SMOOTH;
+ break;
+ default:
+ sst = Inkscape::SNAPSOURCE_UNDEFINED;
+ stt = Inkscape::SNAPTARGET_UNDEFINED;
+ break;
+ }
+ p.push_back(Inkscape::SnapCandidatePoint(curve_it1->finalPoint() * i2d, sst, stt));
}
}
+
+ ++curve_it1;
+ ++curve_it2;
+ }
+
+ // Find the internal intersections of each path and consider these for snapping
+ // (using "Method 1" as described in Inkscape::ObjectSnapper::_collectNodes())
+ if (snapprefs->getSnapIntersectionCS()) {
+ Geom::Crossings cs;
+ try {
+ cs = self_crossings(*path_it);
+ if (cs.size() > 0) { // There might be multiple intersections...
+ for (Geom::Crossings::const_iterator i = cs.begin(); i != cs.end(); i++) {
+ Geom::Point p_ix = (*path_it).pointAt((*i).ta);
+ p.push_back(Inkscape::SnapCandidatePoint(p_ix * i2d, Inkscape::SNAPSOURCE_PATH_INTERSECTION, Inkscape::SNAPTARGET_PATH_INTERSECTION));
+ }
+ }
+ } catch (Geom::RangeError &e) {
+ // do nothing
+ // The exception could be Geom::InfiniteSolutions: then no snappoints should be added
+ }
+
}
-
- b++;
}
+
}
/*
fill-column:99
End:
*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :