X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fmarker.cpp;h=c66acc1924f3869b67faad8373c2d36167292941;hb=958c867c4ffb2cafbc87fb484a20c20dab458f3b;hp=49486476d2ef13a5e11bcee16e1cb15d67de6064;hpb=6b76ef6bb3e9b4e1cc83e01cd81a55bbd0450989;p=inkscape.git diff --git a/src/marker.cpp b/src/marker.cpp index 49486476d..c66acc192 100644 --- a/src/marker.cpp +++ b/src/marker.cpp @@ -37,8 +37,7 @@ struct SPMarkerView { SPMarkerView *next; unsigned int key; - unsigned int size; - NRArenaItem *items[1]; + std::vector items; }; static void sp_marker_class_init (SPMarkerClass *klass); @@ -118,9 +117,9 @@ sp_marker_class_init (SPMarkerClass *klass) static void sp_marker_init (SPMarker *marker) { - marker->viewBox_set = FALSE; - - marker->c2p.setIdentity(); + marker->viewBox = Geom::OptRect(); + marker->c2p.setIdentity(); + marker->views = NULL; } /** @@ -252,7 +251,7 @@ sp_marker_set (SPObject *object, unsigned int key, const gchar *value) object->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); break; case SP_ATTR_VIEWBOX: - marker->viewBox_set = FALSE; + marker->viewBox = Geom::OptRect(); if (value) { double x, y, width, height; char *eptr; @@ -269,11 +268,8 @@ sp_marker_set (SPObject *object, unsigned int key, const gchar *value) while (*eptr && ((*eptr == ',') || (*eptr == ' '))) eptr++; if ((width > 0) && (height > 0)) { /* Set viewbox */ - marker->viewBox.x0 = x; - marker->viewBox.y0 = y; - marker->viewBox.x1 = x + width; - marker->viewBox.y1 = y + height; - marker->viewBox_set = TRUE; + marker->viewBox = Geom::Rect( Geom::Point(x,y), + Geom::Point(x + width, y + height) ); } } object->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_VIEWPORT_MODIFIED_FLAG); @@ -311,7 +307,7 @@ sp_marker_set (SPObject *object, unsigned int key, const gchar *value) align = SP_ASPECT_XMIN_YMID; } else if (!strcmp (c, "xMidYMid")) { align = SP_ASPECT_XMID_YMID; - } else if (!strcmp (c, "xMaxYMin")) { + } else if (!strcmp (c, "xMaxYMid")) { align = SP_ASPECT_XMAX_YMID; } else if (!strcmp (c, "xMinYMax")) { align = SP_ASPECT_XMIN_YMAX; @@ -324,7 +320,7 @@ sp_marker_set (SPObject *object, unsigned int key, const gchar *value) } clip = SP_ASPECT_MEET; while (*e && *e == 32) e += 1; - if (e) { + if (*e) { if (!strcmp (e, "meet")) { clip = SP_ASPECT_MEET; } else if (!strcmp (e, "slice")) { @@ -355,7 +351,7 @@ sp_marker_update (SPObject *object, SPCtx *ctx, guint flags) SPItem *item; SPMarker *marker; SPItemCtx rctx; - NRRect *vb; + Geom::Rect vb; double x, y, width, height; SPMarkerView *v; @@ -367,8 +363,8 @@ sp_marker_update (SPObject *object, SPCtx *ctx, guint flags) /* Copy parent context */ rctx.ctx = *ctx; /* Initialize tranformations */ - rctx.i2doc = NR::identity(); - rctx.i2vp = NR::identity(); + rctx.i2doc = Geom::identity(); + rctx.i2vp = Geom::identity(); /* Set up viewport */ rctx.vp.x0 = 0.0; rctx.vp.y0 = 0.0; @@ -379,10 +375,10 @@ sp_marker_update (SPObject *object, SPCtx *ctx, guint flags) marker->c2p.setIdentity(); /* Viewbox is always present, either implicitly or explicitly */ - if (marker->viewBox_set) { - vb = &marker->viewBox; + if (marker->viewBox) { + vb = *marker->viewBox; } else { - vb = &rctx.vp; + vb = *(rctx.vp.upgrade_2geom()); } /* Now set up viewbox transformation */ /* Determine actual viewbox in viewport coordinates */ @@ -394,11 +390,11 @@ sp_marker_update (SPObject *object, SPCtx *ctx, guint flags) } else { double scalex, scaley, scale; /* Things are getting interesting */ - scalex = (rctx.vp.x1 - rctx.vp.x0) / (vb->x1 - vb->x0); - scaley = (rctx.vp.y1 - rctx.vp.y0) / (vb->y1 - vb->y0); + scalex = (rctx.vp.x1 - rctx.vp.x0) / (vb.width()); + scaley = (rctx.vp.y1 - rctx.vp.y0) / (vb.height()); scale = (marker->aspect_clip == SP_ASPECT_MEET) ? MIN (scalex, scaley) : MAX (scalex, scaley); - width = (vb->x1 - vb->x0) * scale; - height = (vb->y1 - vb->y0) * scale; + width = (vb.width()) * scale; + height = (vb.height()) * scale; /* Now place viewbox to requested position */ switch (marker->aspect_align) { case SP_ASPECT_XMIN_YMIN: @@ -447,12 +443,12 @@ sp_marker_update (SPObject *object, SPCtx *ctx, guint flags) { Geom::Matrix q; /* Compose additional transformation from scale and position */ - q[0] = width / (vb->x1 - vb->x0); - q[1] = 0.0; - q[2] = 0.0; - q[3] = height / (vb->y1 - vb->y0); - q[4] = -vb->x0 * q[0] + x; - q[5] = -vb->y0 * q[3] + y; + q[0] = width / vb.width(); + q[1] = 0.0; + q[2] = 0.0; + q[3] = height / vb.height(); + q[4] = -vb.min()[Geom::X] * q[0] + x; + q[5] = -vb.min()[Geom::Y] * q[3] + y; /* Append viewbox transformation */ marker->c2p = q * marker->c2p; } @@ -465,11 +461,11 @@ sp_marker_update (SPObject *object, SPCtx *ctx, guint flags) /* If viewBox is set reinitialize child viewport */ /* Otherwise it already correct */ - if (marker->viewBox_set) { - rctx.vp.x0 = marker->viewBox.x0; - rctx.vp.y0 = marker->viewBox.y0; - rctx.vp.x1 = marker->viewBox.x1; - rctx.vp.y1 = marker->viewBox.y1; + if (marker->viewBox) { + rctx.vp.x0 = marker->viewBox->min()[Geom::X]; + rctx.vp.y0 = marker->viewBox->min()[Geom::Y]; + rctx.vp.x1 = marker->viewBox->max()[Geom::X]; + rctx.vp.y1 = marker->viewBox->max()[Geom::Y]; rctx.i2vp = Geom::identity(); } @@ -479,12 +475,12 @@ sp_marker_update (SPObject *object, SPCtx *ctx, guint flags) /* As last step set additional transform of arena group */ for (v = marker->views; v != NULL; v = v->next) { - for (unsigned i = 0 ; i < v->size ; i++) { + for (unsigned i = 0 ; i < v->items.size() ; i++) { if (v->items[i]) { - NR::Matrix tmp = from_2geom(marker->c2p); + Geom::Matrix tmp = marker->c2p; nr_arena_group_set_child_transform(NR_ARENA_GROUP(v->items[i]), &tmp); } - } + } } } @@ -603,27 +599,29 @@ sp_marker_print (SPItem */*item*/, SPPrintContext */*ctx*/) void sp_marker_show_dimension (SPMarker *marker, unsigned int key, unsigned int size) { - SPMarkerView *view; - unsigned int i; + SPMarkerView *view; + unsigned int i; - for (view = marker->views; view != NULL; view = view->next) { - if (view->key == key) break; - } - if (view && (view->size != size)) { - /* Free old view and allocate new */ - /* Parent class ::hide method */ - ((SPItemClass *) parent_class)->hide ((SPItem *) marker, key); - sp_marker_view_remove (marker, view, TRUE); - view = NULL; - } - if (!view) { - view = (SPMarkerView *)g_malloc (sizeof (SPMarkerView) + (size) * sizeof (NRArenaItem *)); - for (i = 0; i < size; i++) view->items[i] = NULL; - view->next = marker->views; - marker->views = view; - view->key = key; - view->size = size; - } + for (view = marker->views; view != NULL; view = view->next) { + if (view->key == key) break; + } + if (view && (view->items.size() != size)) { + /* Free old view and allocate new */ + /* Parent class ::hide method */ + ((SPItemClass *) parent_class)->hide ((SPItem *) marker, key); + sp_marker_view_remove (marker, view, TRUE); + view = NULL; + } + if (!view) { + view = new SPMarkerView(); + view->items.clear(); + for (i = 0; i < size; i++) { + view->items.push_back(NULL); + } + view->next = marker->views; + marker->views = view; + view->key = key; + } } /** @@ -637,7 +635,7 @@ sp_marker_show_instance ( SPMarker *marker, NRArenaItem *parent, { for (SPMarkerView *v = marker->views; v != NULL; v = v->next) { if (v->key == key) { - if (pos >= v->size) { + if (pos >= v->items.size()) { return NULL; } if (!v->items[pos]) { @@ -649,7 +647,7 @@ sp_marker_show_instance ( SPMarker *marker, NRArenaItem *parent, /* fixme: Position (Lauris) */ nr_arena_item_add_child (parent, v->items[pos], NULL); /* nr_arena_item_unref (v->items[pos]); */ - NR::Matrix tmp = from_2geom(marker->c2p); + Geom::Matrix tmp = marker->c2p; nr_arena_group_set_child_transform((NRArenaGroup *) v->items[pos], &tmp); } } @@ -659,8 +657,8 @@ sp_marker_show_instance ( SPMarker *marker, NRArenaItem *parent, m = base; } else { /* fixme: Orient units (Lauris) */ - m = Geom::Matrix(Geom::Rotate::from_degrees(marker->orient)); - m *= Geom::Translate(base[4], base[5]); // TODO: this was NR::get_translation() originally; should it be extracted into a new 2geom function? + m = Geom::Rotate::from_degrees(marker->orient); + m *= Geom::Translate(base.translation()); } if (marker->markerUnits == SP_MARKER_UNITS_STROKEWIDTH) { m = Geom::Scale(linewidth) * m; @@ -715,16 +713,17 @@ sp_marker_view_remove (SPMarker *marker, SPMarkerView *view, unsigned int destro v->next = view->next; } if (destroyitems) { - for (i = 0; i < view->size; i++) { + for (i = 0; i < view->items.size(); i++) { /* We have to walk through the whole array because there may be hidden items */ if (view->items[i]) nr_arena_item_unref (view->items[i]); } } - g_free (view); + view->items.clear(); + delete view; } const gchar * -generate_marker (GSList *reprs, NR::Rect bounds, SPDocument *document, Geom::Matrix /*transform*/, Geom::Matrix move) +generate_marker (GSList *reprs, Geom::Rect bounds, SPDocument *document, Geom::Matrix /*transform*/, Geom::Matrix move) { Inkscape::XML::Document *xml_doc = sp_document_repr_doc(document); Inkscape::XML::Node *defsrepr = SP_OBJECT_REPR (SP_DOCUMENT_DEFS (document)); @@ -736,8 +735,8 @@ generate_marker (GSList *reprs, NR::Rect bounds, SPDocument *document, Geom::Mat // stroke width: //repr->setAttribute("markerUnits", "userSpaceOnUse"); - sp_repr_set_svg_double(repr, "markerWidth", bounds.extent(NR::X)); - sp_repr_set_svg_double(repr, "markerHeight", bounds.extent(NR::Y)); + sp_repr_set_svg_double(repr, "markerWidth", bounds.dimensions()[Geom::X]); + sp_repr_set_svg_double(repr, "markerHeight", bounds.dimensions()[Geom::Y]); repr->setAttribute("orient", "auto");