![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/sp-shape.cpp b/src/sp-shape.cpp
index 153d1fa517a4496b28961eb87f767f8cc26682d8..39c1f87a4d26ee280fdf8cac708a8976a6ed5060 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 <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 "marker-status.h"
#include "style.h"
-#include "sp-marker.h"
+#include "marker.h"
#include "sp-path.h"
#include "prefs-utils.h"
+#include "attributes.h"
+
+#include "live_effects/lpeobject.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_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);
+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);
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 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)
{
- 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);
- sp_object_class = (SPObjectClass *) klass;
- item_class = (SPItemClass *) klass;
- path_class = (SPPathClass *) klass;
+ parent_class = (SPLPEItemClass *)g_type_class_peek_parent (klass);
- parent_class = (SPItemClass *)g_type_class_peek_parent (klass);
+ gobject_class->finalize = 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;
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->snappoints = sp_shape_snappoints;
+ lpe_item_class->update_patheffect = NULL;
+
+ klass->set_shape = NULL;
}
/**
- * Initializes an SPShape object. Nothing particular is needed to initialize
- * an SPShape object; this is just here as a stub.
+ * Initializes an SPShape object.
*/
static void
sp_shape_init (SPShape *shape)
{
- /* Nothing here */
+ 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_finalize (GObject *object)
+{
+ SPShape *shape=(SPShape *)object;
+
+ for ( int i = 0 ; i < SP_MARKER_LOC_QTY ; i++ ) {
+ shape->release_connect[i].disconnect();
+ shape->release_connect[i].~connection();
+ shape->modified_connect[i].disconnect();
+ shape->modified_connect[i].~connection();
+ }
+
+ if (((GObjectClass *) (parent_class))->finalize) {
+ (* ((GObjectClass *) (parent_class))->finalize)(object);
+ }
}
/**
* Virtual build callback for SPMarker.
*
- * This is to be invoked immediately after creation of an SPShape. This is
- * just a stub.
+ * This is to be invoked immediately after creation of an SPShape.
*
* \see sp_object_build()
*/
static void
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 *) (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 (((SPObjectClass *) parent_class)->release) {
((SPObjectClass *) parent_class)->release (object);
}
}
+
+
+static void
+sp_shape_set(SPObject *object, unsigned int key, gchar const *value)
+{
+ if (((SPObjectClass *) parent_class)->set) {
+ ((SPObjectClass *) 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)
+{
+ if (((SPObjectClass *)(parent_class))->write) {
+ ((SPObjectClass *)(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.
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::Rect const paintbox = SP_ITEM(object)->invokeBbox(NR::identity());
+ 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));
}
- s->setPaintBox(paintbox);
+ if (paintbox) {
+ s->setPaintBox(*paintbox);
+ }
}
}
* \return 1 if a marker is required here, otherwise 0.
*/
bool
-sp_shape_marker_required(SPShape const *shape, int const m, NArtBpath *bp)
+sp_shape_marker_required(SPShape const *shape, int const m, NArtBpath const *bp)
{
if (shape->marker[m] == NULL) {
return false;
* 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]. */
+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
if (bp == bp0) {
/* Gone right around the subpath without finding any different point since the
* initial moveto. */
- return no_tangent;
+ return no_tangent + 1;
}
if (bp->code != NR_MOVETO) {
/* Open subpath. */
- return no_tangent;
+ return no_tangent + 1;
}
other = bp->c(3);
if (other != p0) {
if (bp == bp0) {
/* Back where we started, so zero-length subpath. */
- return no_tangent;
+ 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 (bp->code != NR_MOVETO) {
/* Open subpath. */
- return no_tangent;
+ 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;
+ return no_tangent + 1;
}
if (bp == bp0) {
/* Back where we started from: zero-length subpath. */
- return no_tangent;
+ return no_tangent + 1;
}
}
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->end )
- && ( SP_CURVE_BPATH(shape->curve)[shape->curve->end].code == NR_END ) ),
+ && ( 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);
- /* 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));
-
double ret_angle;
- if (angle1 == no_tangent) {
+ if (angle1 > no_tangent) {
/* First vertex of an open subpath. */
- ret_angle = ( angle2 == no_tangent
+ ret_angle = ( angle2 > no_tangent
? 0.
: angle2 );
- } else if (angle2 == no_tangent) {
+ } else if (angle2 > no_tangent) {
/* Last vertex of an open subpath. */
ret_angle = angle1;
} else {
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.
+ *
+ * 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.)
+ */
+Geom::Matrix
+sp_shape_marker_get_transform(Geom::Curve const & c1, Geom::Curve const & c2)
+{
+ 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);
+
+ 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 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.
* 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;
-
- marker_status("sp_shape_update_marker_view: Updating views of markers");
+ 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++;
+ }
+ }
}
/**
@@ -584,39 +733,91 @@ 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);
+ 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;
+ }
+ }
+ }
- cbbox.x0 = cbbox.y0 = NR_HUGE;
- cbbox.x1 = cbbox.y1 = -NR_HUGE;
+ // 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]));
- nr_path_matrix_bbox_union(&bp, transform, &cbbox);
+ NR::Matrix tr(from_2geom(sp_shape_marker_get_transform_at_start(path_it->front())));
- SPStyle* style=SP_OBJECT_STYLE (item);
- if (style->stroke.type != SP_PAINT_TYPE_NONE) {
- 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;
- }
- }
- }
+ if (marker->markerUnits == SP_MARKER_UNITS_STROKEWIDTH) {
+ tr = NR::scale(style->stroke_width.computed) * 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)) {
+ // 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;
+ }
+
+ // 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]));
+
+ 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;
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.type != SP_PAINT_TYPE_NONE) {
- NRBPath bp;
- bp.path = SP_CURVE_BPATH(shape->curve);
- sp_print_fill (ctx, &bp, i2d, style, &pbox, &dbox, &bbox);
- }
+ if (!style->fill.isNone()) {
+ const_NRBPath bp;
+ bp.path = SP_CURVE_BPATH(shape->curve);
+ sp_print_fill (ctx, &bp, &i2d, style, &pbox, &dbox, &bbox);
+ }
- if (style->stroke.type != SP_PAINT_TYPE_NONE) {
- NRBPath bp;
- bp.path = SP_CURVE_BPATH(shape->curve);
- sp_print_stroke (ctx, &bp, 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);
+ }
+
+ /* 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]));
- 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)) {
+ 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));
+ tr = marker_item->transform * marker->c2p * tr;
- if (marker->markerUnits == SP_MARKER_UNITS_STROKEWIDTH) {
- tr = NR::scale(style->stroke_width.computed) * 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 */
- tr = marker_item->transform * marker->c2p * tr;
+ 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'",
* 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)
+sp_shape_show (SPItem *item, NRArena *arena, unsigned int /*key*/, unsigned int /*flags*/)
{
SPObject *object = SP_OBJECT(item);
SPShape *shape = SP_SHAPE(item);
@@ -730,8 +978,10 @@ sp_shape_show (SPItem *item, NRArena *arena, unsigned int key, unsigned int flag
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::Rect const paintbox = item->invokeBbox(NR::identity());
- s->setPaintBox(paintbox);
+ NR::Maybe<NR::Rect> paintbox = item->getBounds(NR::identity());
+ if (paintbox) {
+ s->setPaintBox(*paintbox);
+ }
if (sp_shape_has_markers (shape)) {
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)) {
+// 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;
+
+ 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;
+
+ if ( shape->marker[SP_MARKER_LOC_END] && !path_it->empty()) {
n++;
}
}
item = (SPItem *) shape;
- marker_status("sp_shape_marker_release: Releasing markers");
for (i = SP_MARKER_LOC_START; i < SP_MARKER_LOC_QTY; i++) {
if (marker == shape->marker[i]) {
SPItemView *v;
* No-op. Exists for handling 'modified' messages
*/
static void
-sp_shape_marker_modified (SPObject *marker, guint flags, SPItem *item)
+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)); */
return;
}
- SPObject *mrk = sp_uri_reference_resolve (SP_OBJECT_DOCUMENT (object), value);
+ SPObject *mrk = sp_css_uri_reference_resolve (SP_OBJECT_DOCUMENT (object), value);
if (mrk != shape->marker[key]) {
if (shape->marker[key]) {
SPItemView *v;
/* Detach marker */
- g_signal_handler_disconnect (shape->marker[key], shape->release_connect[key]);
- g_signal_handler_disconnect (shape->marker[key], shape->modified_connect[key]);
+ shape->release_connect[key].disconnect();
+ shape->modified_connect[key].disconnect();
/* Hide marker */
for (v = item->display; v != NULL; v = v->next) {
}
if (SP_IS_MARKER (mrk)) {
shape->marker[key] = sp_object_href (mrk, object);
- shape->release_connect[key] = g_signal_connect (G_OBJECT (shape->marker[key]), "release",
- G_CALLBACK (sp_shape_marker_release), shape);
- shape->modified_connect[key] = g_signal_connect (G_OBJECT (shape->marker[key]), "modified",
- G_CALLBACK (sp_shape_marker_modified), shape);
+ shape->release_connect[key] = mrk->connectRelease(sigc::bind<1>(sigc::ptr_fun(&sp_shape_marker_release), shape));
+ shape->modified_connect[key] = mrk->connectModified(sigc::bind<2>(sigc::ptr_fun(&sp_shape_marker_modified), shape));
}
}
}
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();
}
}
}
/**
- * Sets the snappoint p to the end point of the path segment
+ * Return all nodes in a path that are to be considered for snapping
*/
static void sp_shape_snappoints(SPItem const *item, SnapPointsIter p)
{
if (shape->curve == NULL) {
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);
- while (bp->code != NR_END) {
- *p = bp->c(3) * i2d;
- bp++;
+
+ 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")
+ }
+ }
+ }
+
+ b++;
}
}
-
/*
Local Variables:
mode:c++