X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fsp-item.h;h=d95fc2486f1b28ce9cce49c54e3fab5e66ef6e1c;hb=b8a8935e3c014b579eaaf477faefa52fd8c88faa;hp=5596942763b697693202476c19eea54358a37fdb;hpb=9608cf1b33040767b837e6be3a4cbbb72a09cc36;p=inkscape.git diff --git a/src/sp-item.h b/src/sp-item.h index 559694276..d95fc2486 100644 --- a/src/sp-item.h +++ b/src/sp-item.h @@ -21,8 +21,11 @@ #include "display/nr-arena-forward.h" #include "sp-object.h" -#include +#include <2geom/matrix.h> #include +#include <2geom/forward.h> +#include +#include class SPGuideConstraint; struct SPClipPathReference; @@ -54,8 +57,6 @@ struct SPEvent { gpointer data; }; -class SPItemView; - /// SPItemView struct SPItemView { SPItemView *next; @@ -71,28 +72,30 @@ struct SPItemView { #define SP_ITEM_SHOW_DISPLAY (1 << 0) /** - * Flag for referenced views (i.e. clippaths, masks and patterns); always display + * Flag for referenced views (i.e. markers, clippaths, masks and patterns); + currently unused, does the same as DISPLAY */ -#define SP_ITEM_REFERENCE_FLAGS SP_ITEM_SHOW_DISPLAY - -class SPItemCtx; +#define SP_ITEM_REFERENCE_FLAGS (1 << 1) /// Contains transformations to document/viewport and the viewport size. struct SPItemCtx { SPCtx ctx; /** Item to document transformation */ - NR::Matrix i2doc; + Geom::Matrix i2doc; /** Viewport size */ NRRect vp; /** Item to viewport transformation */ - NR::Matrix i2vp; + Geom::Matrix i2vp; }; /** Abstract base class for all visible shapes. */ struct SPItem : public SPObject { enum BBoxType { - APPROXIMATE_BBOX, + // legacy behavior: includes crude stroke, markers; excludes long miters, blur margin; is known to be wrong for caps + APPROXIMATE_BBOX, + // includes only the bare path bbox, no stroke, no nothing GEOMETRIC_BBOX, + // includes everything: correctly done stroke (with proper miters and caps), markers, filter margins (e.g. blur) RENDERING_BBOX }; @@ -101,7 +104,7 @@ struct SPItem : public SPObject { double transform_center_x; double transform_center_y; - NR::Matrix transform; + Geom::Matrix transform; SPClipPathReference *clip_ref; SPMaskReference *mask_ref; @@ -113,7 +116,7 @@ struct SPItem : public SPObject { std::vector constraints; - sigc::signal _transformed_signal; + sigc::signal _transformed_signal; void init(); bool isLocked() const; @@ -132,29 +135,28 @@ struct SPItem : public SPObject { void setExplicitlyHidden(bool val); - void setCenter(NR::Point object_centre); + void setCenter(Geom::Point object_centre); void unsetCenter(); bool isCenterSet(); - NR::Point getCenter(); + Geom::Point getCenter() const; bool isVisibleAndUnlocked() const; bool isVisibleAndUnlocked(unsigned display_key) const; - NR::Matrix getRelativeTransform(SPObject const *obj) const; + Geom::Matrix getRelativeTransform(SPObject const *obj) const; void raiseOne(); void lowerOne(); void raiseToTop(); void lowerToBottom(); - NR::Rect invokeBbox(NR::Matrix const &transform) const; - NR::Maybe getBBox(NR::Matrix const &transform, BBoxType type=APPROXIMATE_BBOX, unsigned int dkey=0) const; + Geom::OptRect getBounds(Geom::Matrix const &transform, BBoxType type=APPROXIMATE_BBOX, unsigned int dkey=0) const; sigc::connection _clip_ref_connection; sigc::connection _mask_ref_connection; - sigc::connection connectTransformed(sigc::slot slot) { + sigc::connection connectTransformed(sigc::slot slot) { return _transformed_signal.connect(slot); } @@ -168,14 +170,14 @@ private: mutable EvaluatedStatus _evaluated_status; }; -typedef std::back_insert_iterator > SnapPointsIter; +typedef std::back_insert_iterator > SnapPointsIter; /// The SPItem vtable. struct SPItemClass { SPObjectClass parent_class; /** BBox union in given coordinate system */ - void (* bbox) (SPItem const *item, NRRect *bbox, NR::Matrix const &transform, unsigned const flags); + void (* bbox) (SPItem const *item, NRRect *bbox, Geom::Matrix const &transform, unsigned const flags); /** Printing method. Assumes ctm is set to item affine matrix */ /* \todo Think about it, and maybe implement generic export method instead (Lauris) */ @@ -190,10 +192,13 @@ struct SPItemClass { /** Write to an iterator the points that should be considered for snapping * as the item's `nodes'. */ - void (* snappoints) (SPItem const *item, SnapPointsIter p); + void (* snappoints) (SPItem const *item, SnapPointsIter p, Inkscape::SnapPreferences const *snapprefs); /** Apply the transform optimally, and return any residual transformation */ - NR::Matrix (* set_transform)(SPItem *item, NR::Matrix const &transform); + Geom::Matrix (* set_transform)(SPItem *item, Geom::Matrix const &transform); + + /** Convert the item to guidelines */ + void (* convert_to_guides)(SPItem *item); /** Emit event, if applicable */ gint (* event) (SPItem *item, SPEvent *event); @@ -205,8 +210,10 @@ struct SPItemClass { /* Methods */ -void sp_item_invoke_bbox(SPItem const *item, NRRect *bbox, NR::Matrix const &transform, unsigned const clear); -void sp_item_invoke_bbox_full(SPItem const *item, NRRect *bbox, NR::Matrix const &transform, unsigned const flags, unsigned const clear); +void sp_item_invoke_bbox(SPItem const *item, Geom::OptRect &bbox, Geom::Matrix const &transform, unsigned const clear, SPItem::BBoxType type = SPItem::APPROXIMATE_BBOX); +void sp_item_invoke_bbox(SPItem const *item, NRRect *bbox, Geom::Matrix const &transform, unsigned const clear, SPItem::BBoxType type = SPItem::APPROXIMATE_BBOX) __attribute__ ((deprecated)); +void sp_item_invoke_bbox_full(SPItem const *item, Geom::OptRect &bbox, Geom::Matrix const &transform, unsigned const flags, unsigned const clear); +void sp_item_invoke_bbox_full(SPItem const *item, NRRect *bbox, Geom::Matrix const &transform, unsigned const flags, unsigned const clear) __attribute__ ((deprecated)); unsigned sp_item_pos_in_parent(SPItem *item); @@ -218,18 +225,20 @@ unsigned int sp_item_display_key_new(unsigned int numkeys); NRArenaItem *sp_item_invoke_show(SPItem *item, NRArena *arena, unsigned int key, unsigned int flags); void sp_item_invoke_hide(SPItem *item, unsigned int key); -void sp_item_snappoints(SPItem const *item, SnapPointsIter p); +void sp_item_snappoints(SPItem const *item, SnapPointsIter p, Inkscape::SnapPreferences const *snapprefs); -void sp_item_adjust_pattern(SPItem *item, /* NR::Matrix const &premul, */ NR::Matrix const &postmul, bool set = false); -void sp_item_adjust_gradient(SPItem *item, /* NR::Matrix const &premul, */ NR::Matrix const &postmul, bool set = false); +void sp_item_adjust_pattern(SPItem *item, /* Geom::Matrix const &premul, */ Geom::Matrix const &postmul, bool set = false); +void sp_item_adjust_gradient(SPItem *item, /* Geom::Matrix const &premul, */ Geom::Matrix const &postmul, bool set = false); void sp_item_adjust_stroke(SPItem *item, gdouble ex); void sp_item_adjust_stroke_width_recursive(SPItem *item, gdouble ex); -void sp_item_adjust_paint_recursive(SPItem *item, NR::Matrix advertized_transform, NR::Matrix t_ancestors, bool is_pattern); +void sp_item_adjust_paint_recursive(SPItem *item, Geom::Matrix advertized_transform, Geom::Matrix t_ancestors, bool is_pattern); +void sp_item_adjust_livepatheffect(SPItem *item, Geom::Matrix const &postmul, bool set = false); -void sp_item_write_transform(SPItem *item, Inkscape::XML::Node *repr, NRMatrix const *transform, NR::Matrix const *adv = NULL); -void sp_item_write_transform(SPItem *item, Inkscape::XML::Node *repr, NR::Matrix const &transform, NR::Matrix const *adv = NULL, bool compensate = true); +void sp_item_write_transform(SPItem *item, Inkscape::XML::Node *repr, Geom::Matrix const &transform, Geom::Matrix const *adv = NULL, bool compensate = true); -void sp_item_set_item_transform(SPItem *item, NR::Matrix const &transform); +void sp_item_set_item_transform(SPItem *item, Geom::Matrix const &transform); + +void sp_item_convert_item_to_guides(SPItem *item); gint sp_item_event (SPItem *item, SPEvent *event); @@ -237,17 +246,13 @@ gint sp_item_event (SPItem *item, SPEvent *event); NRArenaItem *sp_item_get_arenaitem(SPItem *item, unsigned int key); -void sp_item_bbox_desktop(SPItem *item, NRRect *bbox) __attribute__ ((deprecated)); -NR::Rect sp_item_bbox_desktop(SPItem *item); - -NR::Matrix i2anc_affine(SPObject const *item, SPObject const *ancestor); -NR::Matrix i2i_affine(SPObject const *src, SPObject const *dest); +void sp_item_bbox_desktop(SPItem *item, NRRect *bbox, SPItem::BBoxType type = SPItem::APPROXIMATE_BBOX) __attribute__ ((deprecated)); +Geom::OptRect sp_item_bbox_desktop(SPItem *item, SPItem::BBoxType type = SPItem::APPROXIMATE_BBOX); -NR::Matrix sp_item_i2doc_affine(SPItem const *item); -NR::Matrix sp_item_i2root_affine(SPItem const *item); +Geom::Matrix i2anc_affine(SPObject const *item, SPObject const *ancestor); +Geom::Matrix i2i_affine(SPObject const *src, SPObject const *dest); -NR::Matrix matrix_to_desktop (NR::Matrix m, SPItem const *item); -NR::Matrix matrix_from_desktop (NR::Matrix m, SPItem const *item); +Geom::Matrix sp_item_i2doc_affine(SPItem const *item); /* fixme: - these are evil, but OK */ @@ -257,13 +262,14 @@ NR::Matrix matrix_from_desktop (NR::Matrix m, SPItem const *item); * * \return TRANSFORM. */ -NR::Matrix sp_item_i2d_affine(SPItem const *item); -NR::Matrix sp_item_i2r_affine(SPItem const *item); -void sp_item_set_i2d_affine(SPItem *item, NR::Matrix const &transform); -NR::Matrix sp_item_dt2i_affine(SPItem const *item); +Geom::Matrix sp_item_i2d_affine(SPItem const *item); +void sp_item_set_i2d_affine(SPItem *item, Geom::Matrix const &transform); +Geom::Matrix sp_item_dt2i_affine(SPItem const *item); int sp_item_repr_compare_position(SPItem *first, SPItem *second); SPItem *sp_item_first_item_child (SPObject *obj); +void sp_item_convert_to_guides(SPItem *item); + #endif /*