diff --git a/src/object-snapper.cpp b/src/object-snapper.cpp
index 6552cea969379d561c9fc3b7401af6056e6124ac..6146c11b8584b8cbacc9a8a113eb70565a1da49d 100644 (file)
--- a/src/object-snapper.cpp
+++ b/src/object-snapper.cpp
* Authors:
* Carl Hetherington <inkscape@carlh.net>
*
- * Copyright (C) 2005 Authors
+ * Copyright (C) 2005 Authors
*
* Released under GNU GPL, read the file 'COPYING' for more information
*/
Inkscape::ObjectSnapper::ObjectSnapper(SPNamedView const *nv, NR::Coord const d)
: Snapper(nv, d), _snap_to_nodes(true), _snap_to_paths(true)
{
-
+
}
while (i != it.end() && *i != o) {
i++;
}
-
+
if (i == it.end()) {
/* See if the item is within range */
NR::Rect const b = NR::expand(sp_item_bbox_desktop(SP_ITEM(o)), -getDistance());
}
}
}
-
+
_findCandidates(c, o, it, p);
}
}
int j = 0;
NR::Matrix const i2doc = sp_item_i2doc_affine(*i);
-
+
while (sh->curve->bpath[j].code != NR_END) {
/* Get this node in desktop coordinates */
if (dist < getDistance() && dist < s.getDistance()) {
s = SnappedPoint(n, dist);
}
-
+
j++;
}
}
NR::Matrix const i2doc = sp_item_i2doc_affine(*i);
NR::Point const p_it = p_doc * i2doc.inverse();
+ Path *livarot_path = Path_for_item(*i, true, true);
+ if (!livarot_path)
+ continue;
+
+ livarot_path->ConvertWithBackData(0.01);
+
/* Look for the nearest position on this SPItem to our snap point */
- NR::Maybe<Path::cut_position> const o = get_nearest_position_on_Path(*i, p_it);
+ NR::Maybe<Path::cut_position> const o = get_nearest_position_on_Path(livarot_path, p_it);
if (o != NR::Nothing() && o.assume().t >= 0 && o.assume().t <= 1) {
/* Convert the nearest point back to desktop coordinates */
- NR::Point const o_it = get_point_on_Path(*i, o.assume().piece, o.assume().t);
+ NR::Point const o_it = get_point_on_Path(livarot_path, o.assume().piece, o.assume().t);
NR::Point const o_dt = desktop->doc2dt(o_it * i2doc);
-
+
NR::Coord const dist = NR::L2(o_dt - p);
if (dist < getDistance() && dist < s.getDistance()) {
s = SnappedPoint(o_dt, dist);
}
}
+
+ delete livarot_path;
}
}