![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/sp-item.cpp b/src/sp-item.cpp
index fb13b1770bf1d36e4fca810003d960c9f7b2110e..1a5ca6f772a72f7ba94fd99c153062bdabf9502b 100644 (file)
--- a/src/sp-item.cpp
+++ b/src/sp-item.cpp
#include "sp-item-rm-unsatisfied-cns.h"
#include "sp-pattern.h"
#include "sp-switch.h"
+#include "sp-guide-constraint.h"
#include "gradient-chemistry.h"
#include "preferences.h"
#include "conn-avoid-ref.h"
static Inkscape::XML::Node *sp_item_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
static gchar *sp_item_private_description(SPItem *item);
-static void sp_item_private_snappoints(SPItem const *item, SnapPointsIter p, Inkscape::SnapPreferences const *snapprefs);
+static void sp_item_private_snappoints(SPItem const *item, bool const target, SnapPointsWithType &p, Inkscape::SnapPreferences const *snapprefs);
static SPItemView *sp_item_view_new_prepend(SPItemView *list, SPItem *item, unsigned flags, unsigned key, NRArenaItem *arenaitem);
static SPItemView *sp_item_view_list_remove(SPItemView *list, SPItemView *view);
this->avoidRef = new SPAvoidRef(this);
+ new (&this->constraints) std::vector<SPGuideConstraint>();
+
new (&this->_transformed_signal) sigc::signal<void, Geom::Matrix const *, SPItem *>();
}
*/
void
SPItem::setCenter(Geom::Point object_centre) {
+ // for getBounds() to work
+ sp_document_ensure_up_to_date(SP_OBJECT_DOCUMENT(this));
+
Geom::OptRect bbox = getBounds(sp_item_i2d_affine(this));
if (bbox) {
transform_center_x = object_centre[Geom::X] - bbox->midpoint()[Geom::X];
}
Geom::Point SPItem::getCenter() const {
+ // for getBounds() to work
+ sp_document_ensure_up_to_date(SP_OBJECT_DOCUMENT(this));
+
Geom::OptRect bbox = getBounds(sp_item_i2d_affine(this));
if (bbox) {
return to_2geom(bbox->midpoint()) + Geom::Point (this->transform_center_x, this->transform_center_y);
@@ -403,6 +412,7 @@ sp_item_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
sp_object_read_attr(object, "inkscape:transform-center-x");
sp_object_read_attr(object, "inkscape:transform-center-y");
sp_object_read_attr(object, "inkscape:connector-avoid");
+ sp_object_read_attr(object, "inkscape:connection-points");
if (((SPObjectClass *) (parent_class))->build) {
(* ((SPObjectClass *) (parent_class))->build)(object, document, repr);
case SP_ATTR_CONNECTOR_AVOID:
item->avoidRef->setAvoid(value);
break;
+ case SP_ATTR_CONNECTION_POINTS:
+ item->avoidRef->setConnectionPoints(value);
+ break;
case SP_ATTR_TRANSFORM_CENTER_X:
if (value) {
item->transform_center_x = g_strtod(value, NULL);
return rect;
}
-static void sp_item_private_snappoints(SPItem const *item, SnapPointsIter p, Inkscape::SnapPreferences const */*snapprefs*/)
+static void sp_item_private_snappoints(SPItem const *item, bool const target, SnapPointsWithType &p, Inkscape::SnapPreferences const */*snapprefs*/)
{
/* This will only be called if the derived class doesn't override this.
* see for example sp_genericellipse_snappoints in sp-ellipse.cpp
@@ -949,15 +962,16 @@ static void sp_item_private_snappoints(SPItem const *item, SnapPointsIter p, Ink
Geom::Point p1, p2;
p1 = bbox->min();
p2 = bbox->max();
- *p = p1;
- *p = Geom::Point(p1[Geom::X], p2[Geom::Y]);
- *p = p2;
- *p = Geom::Point(p1[Geom::Y], p2[Geom::X]);
+ int type = target ? int(Inkscape::SNAPTARGET_BBOX_CORNER) : int(Inkscape::SNAPSOURCE_BBOX_CORNER);
+ p.push_back(std::make_pair(p1, type));
+ p.push_back(std::make_pair(Geom::Point(p1[Geom::X], p2[Geom::Y]), type));
+ p.push_back(std::make_pair(p2, type));
+ p.push_back(std::make_pair(Geom::Point(p2[Geom::X], p1[Geom::Y]), type));
}
}
-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)
{
g_assert (item != NULL);
g_assert (SP_IS_ITEM(item));
@@ -965,12 +979,12 @@ void sp_item_snappoints(SPItem const *item, SnapPointsIter p, Inkscape::SnapPref
// Get the snappoints of the item
SPItemClass const &item_class = *(SPItemClass const *) G_OBJECT_GET_CLASS(item);
if (item_class.snappoints) {
- item_class.snappoints(item, p, snapprefs);
+ item_class.snappoints(item, target, p, snapprefs);
}
// Get the snappoints at the item's center
if (snapprefs != NULL && snapprefs->getIncludeItemCenter()) {
- *p = item->getCenter();
+ p.push_back(std::make_pair(item->getCenter(), target ? int(Inkscape::SNAPTARGET_ROTATION_CENTER) : int(Inkscape::SNAPSOURCE_ROTATION_CENTER)));
}
// Get the snappoints of clipping paths and mask, if any
@@ -985,14 +999,15 @@ void sp_item_snappoints(SPItem const *item, SnapPointsIter p, Inkscape::SnapPref
// obj is a group object, the children are the actual clippers
for (SPObject *child = (*o)->children ; child ; child = child->next) {
if (SP_IS_ITEM(child)) {
- std::vector<Geom::Point> p_clip_or_mask;
+ SnapPointsWithType p_clip_or_mask;
// Please note the recursive call here!
- sp_item_snappoints(SP_ITEM(child), SnapPointsIter(p_clip_or_mask), snapprefs);
+ sp_item_snappoints(SP_ITEM(child), target, p_clip_or_mask, snapprefs);
// Take into account the transformation of the item being clipped or masked
- for (std::vector<Geom::Point>::const_iterator p_orig = p_clip_or_mask.begin(); p_orig != p_clip_or_mask.end(); p_orig++) {
+ for (SnapPointsWithType::const_iterator p_orig = p_clip_or_mask.begin(); p_orig != p_clip_or_mask.end(); p_orig++) {
// All snappoints are in desktop coordinates, but the item's transformation is
// in document coordinates. Hence the awkward construction below
- *p = desktop->dt2doc(*p_orig) * sp_item_i2d_affine(item);
+ Geom::Point pt = desktop->dt2doc((*p_orig).first) * sp_item_i2d_affine(item);
+ p.push_back(std::make_pair(pt, (*p_orig).second));
}
}
}
g_free (s);
s = snew;
}
- if (SP_OBJECT_STYLE(item) && SP_OBJECT_STYLE(item)->filter.href) {
- gchar *snew = g_strdup_printf (_("%s; <i>filtered</i>"), s);
+ if (SP_OBJECT_STYLE(item) && SP_OBJECT_STYLE(item)->filter.href && SP_OBJECT_STYLE(item)->filter.href->getObject()) {
+ const gchar *label = SP_OBJECT_STYLE(item)->filter.href->getObject()->label();
+ gchar *snew;
+ if (label) {
+ snew = g_strdup_printf (_("%s; <i>filtered (%s)</i>"), s, _(label));
+ } else {
+ snew = g_strdup_printf (_("%s; <i>filtered</i>"), s);
+ }
g_free (s);
s = snew;
}
g_assert(item != NULL);
g_assert(SP_IS_ITEM(item));
- SPDesktop *desktop = inkscape_active_desktop();
- return sp_item_i2doc_affine(item) * desktop->doc2dt();
+ Geom::Matrix const ret( sp_item_i2doc_affine(item)
+ * Geom::Scale(1, -1)
+ * Geom::Translate(0, sp_document_height(SP_OBJECT_DOCUMENT(item))) );
+ return ret;
}
void sp_item_set_i2d_affine(SPItem *item, Geom::Matrix const &i2dt)