X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fsp-item.h;h=639a1b4a2a18d1d0c601cc41706281ce25d9a04d;hb=d91c7044b45dde766203822b19e4affead5ce10f;hp=1cc05eb25aab3e0114bdc9119198899021056528;hpb=6c3e745a94ef6b25a4ef9f018d350a7535aa45af;p=inkscape.git diff --git a/src/sp-item.h b/src/sp-item.h index 1cc05eb25..639a1b4a2 100644 --- a/src/sp-item.h +++ b/src/sp-item.h @@ -21,11 +21,12 @@ #include "display/nr-arena-forward.h" #include "sp-object.h" -#include +#include <2geom/matrix.h> #include #include <2geom/forward.h> #include #include +#include class SPGuideConstraint; struct SPClipPathReference; @@ -33,7 +34,7 @@ struct SPMaskReference; struct SPAvoidRef; struct SPPrintContext; namespace Inkscape { class URIReference; } - + enum { SP_EVENT_INVALID, SP_EVENT_NONE, @@ -57,8 +58,6 @@ struct SPEvent { gpointer data; }; -class SPItemView; - /// SPItemView struct SPItemView { SPItemView *next; @@ -74,13 +73,11 @@ struct SPItemView { #define SP_ITEM_SHOW_DISPLAY (1 << 0) /** - * Flag for referenced views (i.e. markers, clippaths, masks and patterns); + * Flag for referenced views (i.e. markers, clippaths, masks and patterns); currently unused, does the same as DISPLAY */ #define SP_ITEM_REFERENCE_FLAGS (1 << 1) -class SPItemCtx; - /// Contains transformations to document/viewport and the viewport size. struct SPItemCtx { SPCtx ctx; @@ -96,7 +93,7 @@ struct SPItemCtx { struct SPItem : public SPObject { enum BBoxType { // legacy behavior: includes crude stroke, markers; excludes long miters, blur margin; is known to be wrong for caps - APPROXIMATE_BBOX, + 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) @@ -109,34 +106,34 @@ struct SPItem : public SPObject { double transform_center_y; Geom::Matrix transform; - + SPClipPathReference *clip_ref; SPMaskReference *mask_ref; - + // Used for object-avoiding connectors SPAvoidRef *avoidRef; - + SPItemView *display; - + std::vector constraints; - + sigc::signal _transformed_signal; - void init(); + void init(); bool isLocked() const; void setLocked(bool lock); - + bool isHidden() const; void setHidden(bool hidden); bool isEvaluated() const; void setEvaluated(bool visible); void resetEvaluated(); - + bool isHidden(unsigned display_key) const; - + bool isExplicitlyHidden() const; - + void setExplicitlyHidden(bool val); void setCenter(Geom::Point object_centre); @@ -145,11 +142,11 @@ struct SPItem : public SPObject { Geom::Point getCenter() const; bool isVisibleAndUnlocked() const; - + bool isVisibleAndUnlocked(unsigned display_key) const; - + Geom::Matrix getRelativeTransform(SPObject const *obj) const; - + void raiseOne(); void lowerOne(); void raiseToTop(); @@ -174,7 +171,7 @@ private: mutable EvaluatedStatus _evaluated_status; }; -typedef std::back_insert_iterator > SnapPointsIter; +typedef std::vector > SnapPointsWithType; // int is either of these enums: Inkscape::SnapTargetType or Inkscape::SnapSourceType /// The SPItem vtable. struct SPItemClass { @@ -182,28 +179,28 @@ struct SPItemClass { /** BBox union in given coordinate system */ 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) */ void (* print) (SPItem *item, SPPrintContext *ctx); - + /** Give short description of item (for status display) */ gchar * (* description) (SPItem * item); - + NRArenaItem * (* show) (SPItem *item, NRArena *arena, unsigned int key, unsigned int flags); void (* hide) (SPItem *item, unsigned int key); - + /** Write to an iterator the points that should be considered for snapping * as the item's `nodes'. */ - void (* snappoints) (SPItem const *item, SnapPointsIter p, Inkscape::SnapPreferences const *snapprefs); - + void (* snappoints) (SPItem const *item, bool const target, SnapPointsWithType &p, Inkscape::SnapPreferences const *snapprefs); + /** Apply the transform optimally, and return any residual transformation */ 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); }; @@ -229,7 +226,7 @@ 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, Inkscape::SnapPreferences const *snapprefs); +void sp_item_snappoints(SPItem const *item, bool const target, SnapPointsWithType &p, Inkscape::SnapPreferences const *snapprefs); 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); @@ -238,7 +235,6 @@ void sp_item_adjust_stroke_width_recursive(SPItem *item, gdouble ex); 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, Geom::Matrix const *transform, Geom::Matrix const *adv = NULL); 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, Geom::Matrix const &transform); @@ -258,10 +254,6 @@ Geom::Matrix i2anc_affine(SPObject const *item, SPObject const *ancestor); Geom::Matrix i2i_affine(SPObject const *src, SPObject const *dest); Geom::Matrix sp_item_i2doc_affine(SPItem const *item); -Geom::Matrix sp_item_i2root_affine(SPItem const *item); - -Geom::Matrix matrix_to_desktop (Geom::Matrix m, SPItem const *item); -Geom::Matrix matrix_from_desktop (Geom::Matrix m, SPItem const *item); /* fixme: - these are evil, but OK */ @@ -272,7 +264,6 @@ Geom::Matrix matrix_from_desktop (Geom::Matrix m, SPItem const *item); * \return TRANSFORM. */ Geom::Matrix sp_item_i2d_affine(SPItem const *item); -Geom::Matrix sp_item_i2r_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);