X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fsp-rect.cpp;h=6030991e27cd71ef5a89c370ea0f5f132bc75a51;hb=ade0885a2e901343f0724651cb8ca3657421fe22;hp=2e9befa3204fa803af13bd590386ab24bb3a9b9c;hpb=c87b166f1c3ba0af0656b0b634d1a444e6a316ff;p=inkscape.git diff --git a/src/sp-rect.cpp b/src/sp-rect.cpp index 2e9befa32..6030991e2 100644 --- a/src/sp-rect.cpp +++ b/src/sp-rect.cpp @@ -1,5 +1,3 @@ -#define __SP_RECT_C__ - /* * SVG implementation * @@ -19,9 +17,10 @@ #include -#include +#include #include +#include "inkscape.h" #include "document.h" #include "attributes.h" #include "style.h" @@ -29,7 +28,7 @@ #include #include "xml/repr.h" #include "sp-guide.h" -#include "prefs-utils.h" +#include "preferences.h" #define noRECT_VERBOSE @@ -39,14 +38,14 @@ static void sp_rect_init(SPRect *rect); static void sp_rect_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr); static void sp_rect_set(SPObject *object, unsigned key, gchar const *value); static void sp_rect_update(SPObject *object, SPCtx *ctx, guint flags); -static Inkscape::XML::Node *sp_rect_write(SPObject *object, Inkscape::XML::Node *repr, guint flags); +static Inkscape::XML::Node *sp_rect_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags); static gchar *sp_rect_description(SPItem *item); -static NR::Matrix sp_rect_set_transform(SPItem *item, NR::Matrix const &xform); +static Geom::Matrix sp_rect_set_transform(SPItem *item, Geom::Matrix const &xform); static void sp_rect_convert_to_guides(SPItem *item); static void sp_rect_set_shape(SPShape *shape); -static void sp_rect_snappoints(SPItem const *item, SnapPointsIter p); +static void sp_rect_snappoints(SPItem const *item, SnapPointsIter p, Inkscape::SnapPreferences const *snapprefs); static SPShapeClass *parent_class; @@ -110,8 +109,6 @@ sp_rect_init(SPRect */*rect*/) static void sp_rect_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr) { - SPRect *rect = SP_RECT(object); - if (((SPObjectClass *) parent_class)->build) ((SPObjectClass *) parent_class)->build(object, document, repr); @@ -177,7 +174,7 @@ sp_rect_update(SPObject *object, SPCtx *ctx, guint flags) SPRect *rect = (SPRect *) object; SPStyle *style = object->style; SPItemCtx const *ictx = (SPItemCtx const *) ctx; - double const d = NR::expansion(ictx->i2vp); + double const d = ictx->i2vp.descrim(); double const w = (ictx->vp.x1 - ictx->vp.x0) / d; double const h = (ictx->vp.y1 - ictx->vp.y0) / d; double const em = style->font_size.computed; @@ -197,12 +194,11 @@ sp_rect_update(SPObject *object, SPCtx *ctx, guint flags) } static Inkscape::XML::Node * -sp_rect_write(SPObject *object, Inkscape::XML::Node *repr, guint flags) +sp_rect_write(SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags) { SPRect *rect = SP_RECT(object); if ((flags & SP_OBJECT_WRITE_BUILD) && !repr) { - Inkscape::XML::Document *xml_doc = sp_document_repr_doc(SP_OBJECT_DOCUMENT(object)); repr = xml_doc->createElement("svg:rect"); } @@ -214,7 +210,7 @@ sp_rect_write(SPObject *object, Inkscape::XML::Node *repr, guint flags) sp_repr_set_svg_double(repr, "y", rect->y.computed); if (((SPObjectClass *) parent_class)->write) - ((SPObjectClass *) parent_class)->write(object, repr, flags); + ((SPObjectClass *) parent_class)->write(object, xml_doc, repr, flags); return repr; } @@ -239,7 +235,7 @@ sp_rect_set_shape(SPShape *shape) return; } - SPCurve *c = sp_curve_new(); + SPCurve *c = new SPCurve(); double const x = rect->x.computed; double const y = rect->y.computed; @@ -268,26 +264,26 @@ sp_rect_set_shape(SPShape *shape) * arc fairly well. */ if ((rx > 1e-18) && (ry > 1e-18)) { - sp_curve_moveto(c, x + rx, y); - if (rx < w2) sp_curve_lineto(c, x + w - rx, y); - sp_curve_curveto(c, x + w - rx * (1 - C1), y, x + w, y + ry * (1 - C1), x + w, y + ry); - if (ry < h2) sp_curve_lineto(c, x + w, y + h - ry); - sp_curve_curveto(c, x + w, y + h - ry * (1 - C1), x + w - rx * (1 - C1), y + h, x + w - rx, y + h); - if (rx < w2) sp_curve_lineto(c, x + rx, y + h); - sp_curve_curveto(c, x + rx * (1 - C1), y + h, x, y + h - ry * (1 - C1), x, y + h - ry); - if (ry < h2) sp_curve_lineto(c, x, y + ry); - sp_curve_curveto(c, x, y + ry * (1 - C1), x + rx * (1 - C1), y, x + rx, y); + c->moveto(x + rx, y); + if (rx < w2) c->lineto(x + w - rx, y); + c->curveto(x + w - rx * (1 - C1), y, x + w, y + ry * (1 - C1), x + w, y + ry); + if (ry < h2) c->lineto(x + w, y + h - ry); + c->curveto(x + w, y + h - ry * (1 - C1), x + w - rx * (1 - C1), y + h, x + w - rx, y + h); + if (rx < w2) c->lineto(x + rx, y + h); + c->curveto(x + rx * (1 - C1), y + h, x, y + h - ry * (1 - C1), x, y + h - ry); + if (ry < h2) c->lineto(x, y + ry); + c->curveto(x, y + ry * (1 - C1), x + rx * (1 - C1), y, x + rx, y); } else { - sp_curve_moveto(c, x + 0.0, y + 0.0); - sp_curve_lineto(c, x + w, y + 0.0); - sp_curve_lineto(c, x + w, y + h); - sp_curve_lineto(c, x + 0.0, y + h); - sp_curve_lineto(c, x + 0.0, y + 0.0); + c->moveto(x + 0.0, y + 0.0); + c->lineto(x + w, y + 0.0); + c->lineto(x + w, y + h); + c->lineto(x + 0.0, y + h); + c->lineto(x + 0.0, y + 0.0); } - sp_curve_closepath_current(c); + c->closepath_current(); sp_shape_set_curve_insync(SP_SHAPE(rect), c, TRUE); - sp_curve_unref(c); + c->unref(); } /* fixme: Think (Lauris) */ @@ -338,17 +334,17 @@ sp_rect_set_ry(SPRect *rect, gboolean set, gdouble value) /* fixme: Use preferred units somehow (Lauris) */ /* fixme: Alternately preserve whatever units there are (lauris) */ -static NR::Matrix -sp_rect_set_transform(SPItem *item, NR::Matrix const &xform) +static Geom::Matrix +sp_rect_set_transform(SPItem *item, Geom::Matrix const &xform) { SPRect *rect = SP_RECT(item); /* Calculate rect start in parent coords. */ - NR::Point pos( NR::Point(rect->x.computed, rect->y.computed) * xform ); + Geom::Point pos( Geom::Point(rect->x.computed, rect->y.computed) * xform ); /* This function takes care of translation and scaling, we return whatever parts we can't handle. */ - NR::Matrix ret(NR::transform(xform)); + Geom::Matrix ret(Geom::Matrix(xform).without_translation()); gdouble const sw = hypot(ret[0], ret[1]); gdouble const sh = hypot(ret[2], ret[3]); if (sw > 1e-9) { @@ -378,8 +374,8 @@ sp_rect_set_transform(SPItem *item, NR::Matrix const &xform) /* Find start in item coords */ pos = pos * ret.inverse(); - rect->x = pos[NR::X]; - rect->y = pos[NR::Y]; + rect->x = pos[Geom::X]; + rect->y = pos[Geom::Y]; sp_rect_set_shape(rect); @@ -387,10 +383,10 @@ sp_rect_set_transform(SPItem *item, NR::Matrix const &xform) sp_item_adjust_stroke(item, sqrt(fabs(sw * sh))); // Adjust pattern fill - sp_item_adjust_pattern(item, xform / ret); + sp_item_adjust_pattern(item, xform * ret.inverse()); // Adjust gradient fill - sp_item_adjust_gradient(item, xform / ret); + sp_item_adjust_gradient(item, xform * ret.inverse()); item->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG); @@ -402,11 +398,11 @@ sp_rect_set_transform(SPItem *item, NR::Matrix const &xform) Returns the ratio in which the vector from p0 to p1 is stretched by transform */ static gdouble -vector_stretch(NR::Point p0, NR::Point p1, NR::Matrix xform) +vector_stretch(Geom::Point p0, Geom::Point p1, Geom::Matrix xform) { if (p0 == p1) return 0; - return (NR::distance(p0 * xform, p1 * xform) / NR::distance(p0, p1)); + return (Geom::distance(p0 * xform, p1 * xform) / Geom::distance(p0, p1)); } void @@ -417,8 +413,8 @@ sp_rect_set_visible_rx(SPRect *rect, gdouble rx) rect->rx._set = false; } else { rect->rx.computed = rx / vector_stretch( - NR::Point(rect->x.computed + 1, rect->y.computed), - NR::Point(rect->x.computed, rect->y.computed), + Geom::Point(rect->x.computed + 1, rect->y.computed), + Geom::Point(rect->x.computed, rect->y.computed), SP_ITEM(rect)->transform); rect->rx._set = true; } @@ -433,8 +429,8 @@ sp_rect_set_visible_ry(SPRect *rect, gdouble ry) rect->ry._set = false; } else { rect->ry.computed = ry / vector_stretch( - NR::Point(rect->x.computed, rect->y.computed + 1), - NR::Point(rect->x.computed, rect->y.computed), + Geom::Point(rect->x.computed, rect->y.computed + 1), + Geom::Point(rect->x.computed, rect->y.computed), SP_ITEM(rect)->transform); rect->ry._set = true; } @@ -447,8 +443,8 @@ sp_rect_get_visible_rx(SPRect *rect) if (!rect->rx._set) return 0; return rect->rx.computed * vector_stretch( - NR::Point(rect->x.computed + 1, rect->y.computed), - NR::Point(rect->x.computed, rect->y.computed), + Geom::Point(rect->x.computed + 1, rect->y.computed), + Geom::Point(rect->x.computed, rect->y.computed), SP_ITEM(rect)->transform); } @@ -458,21 +454,21 @@ sp_rect_get_visible_ry(SPRect *rect) if (!rect->ry._set) return 0; return rect->ry.computed * vector_stretch( - NR::Point(rect->x.computed, rect->y.computed + 1), - NR::Point(rect->x.computed, rect->y.computed), + Geom::Point(rect->x.computed, rect->y.computed + 1), + Geom::Point(rect->x.computed, rect->y.computed), SP_ITEM(rect)->transform); } void -sp_rect_compensate_rxry(SPRect *rect, NR::Matrix xform) +sp_rect_compensate_rxry(SPRect *rect, Geom::Matrix xform) { if (rect->rx.computed == 0 && rect->ry.computed == 0) return; // nothing to compensate // test unit vectors to find out compensation: - NR::Point c(rect->x.computed, rect->y.computed); - NR::Point cx = c + NR::Point(1, 0); - NR::Point cy = c + NR::Point(0, 1); + Geom::Point c(rect->x.computed, rect->y.computed); + Geom::Point cx = c + Geom::Point(1, 0); + Geom::Point cy = c + Geom::Point(0, 1); // apply previous transform if any c *= SP_ITEM(rect)->transform; @@ -505,8 +501,8 @@ void sp_rect_set_visible_width(SPRect *rect, gdouble width) { rect->width.computed = width / vector_stretch( - NR::Point(rect->x.computed + 1, rect->y.computed), - NR::Point(rect->x.computed, rect->y.computed), + Geom::Point(rect->x.computed + 1, rect->y.computed), + Geom::Point(rect->x.computed, rect->y.computed), SP_ITEM(rect)->transform); rect->width._set = true; SP_OBJECT(rect)->updateRepr(); @@ -516,8 +512,8 @@ void sp_rect_set_visible_height(SPRect *rect, gdouble height) { rect->height.computed = height / vector_stretch( - NR::Point(rect->x.computed, rect->y.computed + 1), - NR::Point(rect->x.computed, rect->y.computed), + Geom::Point(rect->x.computed, rect->y.computed + 1), + Geom::Point(rect->x.computed, rect->y.computed), SP_ITEM(rect)->transform); rect->height._set = true; SP_OBJECT(rect)->updateRepr(); @@ -529,8 +525,8 @@ sp_rect_get_visible_width(SPRect *rect) if (!rect->width._set) return 0; return rect->width.computed * vector_stretch( - NR::Point(rect->x.computed + 1, rect->y.computed), - NR::Point(rect->x.computed, rect->y.computed), + Geom::Point(rect->x.computed + 1, rect->y.computed), + Geom::Point(rect->x.computed, rect->y.computed), SP_ITEM(rect)->transform); } @@ -540,61 +536,61 @@ sp_rect_get_visible_height(SPRect *rect) if (!rect->height._set) return 0; return rect->height.computed * vector_stretch( - NR::Point(rect->x.computed, rect->y.computed + 1), - NR::Point(rect->x.computed, rect->y.computed), + Geom::Point(rect->x.computed, rect->y.computed + 1), + Geom::Point(rect->x.computed, rect->y.computed), SP_ITEM(rect)->transform); } /** * Sets the snappoint p to the unrounded corners of the rectangle */ -static void sp_rect_snappoints(SPItem const *item, SnapPointsIter p) +static void sp_rect_snappoints(SPItem const *item, SnapPointsIter p, Inkscape::SnapPreferences const */*snapprefs*/) { /* This method overrides sp_shape_snappoints, which is the default for any shape. The default method returns all eight points along the path of a rounded rectangle, but not the real corners. Snapping - the startpoint and endpoint of each rounded corner is not very usefull and really confusing. Instead + the startpoint and endpoint of each rounded corner is not very usefull and really confusing. Instead we could snap either the real corners, or not snap at all. Bulia Byak opted to snap the real corners, - but it should be noted that this might be confusing in some cases with relatively large radii. With + but it should be noted that this might be confusing in some cases with relatively large radii. With small radii though the user will easily understand which point is snapping. */ - + g_assert(item != NULL); g_assert(SP_IS_RECT(item)); SPRect *rect = SP_RECT(item); - NR::Matrix const i2d (sp_item_i2d_affine (item)); + Geom::Matrix const i2d (sp_item_i2d_affine (item)); - *p = NR::Point(rect->x.computed, rect->y.computed) * i2d; - *p = NR::Point(rect->x.computed, rect->y.computed + rect->height.computed) * i2d; - *p = NR::Point(rect->x.computed + rect->width.computed, rect->y.computed + rect->height.computed) * i2d; - *p = NR::Point(rect->x.computed + rect->width.computed, rect->y.computed) * i2d; + *p = Geom::Point(rect->x.computed, rect->y.computed) * i2d; + *p = Geom::Point(rect->x.computed, rect->y.computed + rect->height.computed) * i2d; + *p = Geom::Point(rect->x.computed + rect->width.computed, rect->y.computed + rect->height.computed) * i2d; + *p = Geom::Point(rect->x.computed + rect->width.computed, rect->y.computed) * i2d; } void sp_rect_convert_to_guides(SPItem *item) { SPRect *rect = SP_RECT(item); - if (prefs_get_int_attribute("tools.shapes.rect", "convertguides", 1) == 0) { + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + if (!prefs->getBool("/tools/shapes/rect/convertguides", true)) { sp_item_convert_to_guides(SP_ITEM(rect)); return; } - SPDocument *doc = SP_OBJECT_DOCUMENT(rect); std::list > pts; - NR::Matrix const i2d (sp_item_i2d_affine(SP_ITEM(rect))); + Geom::Matrix const i2d (sp_item_i2d_affine(SP_ITEM(rect))); - NR::Point A1(NR::Point(rect->x.computed, rect->y.computed) * i2d); - NR::Point A2(NR::Point(rect->x.computed, rect->y.computed + rect->height.computed) * i2d); - NR::Point A3(NR::Point(rect->x.computed + rect->width.computed, rect->y.computed + rect->height.computed) * i2d); - NR::Point A4(NR::Point(rect->x.computed + rect->width.computed, rect->y.computed) * i2d); + Geom::Point A1(Geom::Point(rect->x.computed, rect->y.computed) * i2d); + Geom::Point A2(Geom::Point(rect->x.computed, rect->y.computed + rect->height.computed) * i2d); + Geom::Point A3(Geom::Point(rect->x.computed + rect->width.computed, rect->y.computed + rect->height.computed) * i2d); + Geom::Point A4(Geom::Point(rect->x.computed + rect->width.computed, rect->y.computed) * i2d); - pts.push_back(std::make_pair(A1.to_2geom(), A2.to_2geom())); - pts.push_back(std::make_pair(A2.to_2geom(), A3.to_2geom())); - pts.push_back(std::make_pair(A3.to_2geom(), A4.to_2geom())); - pts.push_back(std::make_pair(A4.to_2geom(), A1.to_2geom())); + pts.push_back(std::make_pair(A1, A2)); + pts.push_back(std::make_pair(A2, A3)); + pts.push_back(std::make_pair(A3, A4)); + pts.push_back(std::make_pair(A4, A1)); - sp_guide_pt_pairs_to_guides(doc, pts); + sp_guide_pt_pairs_to_guides(inkscape_active_desktop(), pts); } /*