diff --git a/src/sp-item.h b/src/sp-item.h
index 141d3f88119d0dd5e774243adf615e28036f5529..89a74ceafd65f8982b4674b60c4168b4f36a2bb2 100644 (file)
--- a/src/sp-item.h
+++ b/src/sp-item.h
* Authors:
* Lauris Kaplinski <lauris@kaplinski.com>
* bulia byak <buliabyak@users.sf.net>
+ * Johan Engelen <j.b.c.engelen@ewi.utwente.nl>
*
- * Copyright (C) 1999-2005 authors
+ * Copyright (C) 1999-2006 authors
* Copyright (C) 2001-2002 Ximian, Inc.
* Copyright (C) 2004 Monash University
*
/** Abstract base class for all visible shapes. */
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,
+ // 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
+ };
+
unsigned int sensitive : 1;
unsigned int stop_paint: 1;
double transform_center_x;
std::vector<SPGuideConstraint> constraints;
sigc::signal<void, NR::Matrix const *, SPItem *> _transformed_signal;
-
+
+ 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;
void setCenter(NR::Point object_centre);
void unsetCenter();
bool isCenterSet();
- NR::Point getCenter();
+ NR::Point getCenter() const;
bool isVisibleAndUnlocked() const;
void raiseToTop();
void lowerToBottom();
- NR::Rect invokeBbox(NR::Matrix const &transform) const;
+ NR::Maybe<NR::Rect> getBounds(NR::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<void, NR::Matrix const *, SPItem *> slot) {
return _transformed_signal.connect(slot);
}
+
+private:
+ enum EvaluatedStatus
+ {
+ StatusUnknown, StatusCalculated, StatusSet
+ };
+
+ mutable bool _is_evaluated;
+ mutable EvaluatedStatus _evaluated_status;
};
typedef std::back_insert_iterator<std::vector<NR::Point> > SnapPointsIter;
/* Methods */
-void sp_item_invoke_bbox(SPItem const *item, NRRect *bbox, NR::Matrix const &transform, unsigned const clear);
+void sp_item_invoke_bbox(SPItem const *item, NRRect *bbox, NR::Matrix const &transform, unsigned const clear, SPItem::BBoxType type = SPItem::APPROXIMATE_BBOX);
void sp_item_invoke_bbox_full(SPItem const *item, NRRect *bbox, NR::Matrix const &transform, unsigned const flags, unsigned const clear);
unsigned sp_item_pos_in_parent(SPItem *item);
void sp_item_adjust_paint_recursive(SPItem *item, NR::Matrix advertized_transform, NR::Matrix t_ancestors, bool is_pattern);
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);
+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_set_item_transform(SPItem *item, NR::Matrix const &transform);
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);
+void sp_item_bbox_desktop(SPItem *item, NRRect *bbox, SPItem::BBoxType type = SPItem::APPROXIMATE_BBOX) __attribute__ ((deprecated));
+NR::Maybe<NR::Rect> sp_item_bbox_desktop(SPItem *item, SPItem::BBoxType type = SPItem::APPROXIMATE_BBOX);
NR::Matrix i2anc_affine(SPObject const *item, SPObject const *ancestor);
NR::Matrix i2i_affine(SPObject const *src, SPObject const *dest);