![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/object-snapper.cpp b/src/object-snapper.cpp
index 8c728cd977ba8cf0899f235a1f73eae2f6010671..06f24c47fa1129d28623bfbedea13f6710a82116 100644 (file)
--- a/src/object-snapper.cpp
+++ b/src/object-snapper.cpp
* Released under GNU GPL, read the file 'COPYING' for more information
*/
-#include "libnr/n-art-bpath.h"
-#include "libnr/nr-path.h"
+#include "svg/svg.h"
#include "libnr/nr-rect-ops.h"
#include "libnr/nr-point-fns.h"
-#include "live_effects/n-art-bpath-2geom.h"
-#include "2geom/path-intersection.h"
+#include <2geom/path-intersection.h>
+#include <2geom/point.h>
+#include <2geom/rect.h>
#include "document.h"
#include "sp-namedview.h"
#include "sp-image.h"
#include "sp-item.h"
#include "sp-use.h"
#include "display/curve.h"
-#include "desktop.h"
#include "inkscape.h"
-#include "prefs-utils.h"
+#include "preferences.h"
#include "sp-text.h"
#include "sp-flowtext.h"
#include "text-editing.h"
+#include "sp-clippath.h"
+#include "sp-mask.h"
+#include "helper/geom-curves.h"
+#include "desktop.h"
+
+Inkscape::SnapCandidate::SnapCandidate(SPItem* item, bool clip_or_mask, Geom::Matrix additional_affine)
+ : item(item), clip_or_mask(clip_or_mask), additional_affine(additional_affine)
+{
+}
+
+Inkscape::SnapCandidate::~SnapCandidate()
+{
+}
-Inkscape::ObjectSnapper::ObjectSnapper(SPNamedView const *nv, NR::Coord const d)
- : Snapper(nv, d), _snap_to_itemnode(true), _snap_to_itempath(true),
+Inkscape::ObjectSnapper::ObjectSnapper(SnapManager const *sm, Geom::Coord const d)
+ : Snapper(sm, d), _snap_to_itemnode(true), _snap_to_itempath(true),
_snap_to_bboxnode(true), _snap_to_bboxpath(true), _snap_to_page_border(false),
- _strict_snapping(true), _include_item_center(false)
+ _strict_snapping(true)
{
- _candidates = new std::vector<SPItem*>;
- _points_to_snap_to = new std::vector<NR::Point>;
- _bpaths_to_snap_to = new std::vector<NArtBpath*>;
- _paths_to_snap_to = new std::vector<Path*>;
+ _candidates = new std::vector<SnapCandidate>;
+ _points_to_snap_to = new std::vector<Geom::Point>;
+ _paths_to_snap_to = new std::vector<Geom::PathVector*>;
}
Inkscape::ObjectSnapper::~ObjectSnapper()
{
- _candidates->clear(); //Don't delete the candidates themselves, as these are not ours!
+ _candidates->clear();
delete _candidates;
_points_to_snap_to->clear();
_clear_paths();
delete _paths_to_snap_to;
- delete _bpaths_to_snap_to;
}
/**
* Find all items within snapping range.
- * \param r Pointer to the current document
+ * \param parent Pointer to the document's root, or to a clipped path or mask object
* \param it List of items to ignore
* \param first_point If true then this point is the first one from a whole bunch of points
- * \param points_to_snap The whole bunch of points, all from the same selection and having the same transformation
+ * \param bbox_to_snap Bounding box hulling the whole bunch of points, all from the same selection and having the same transformation
* \param DimensionToSnap Snap in X, Y, or both directions.
*/
-void Inkscape::ObjectSnapper::_findCandidates(SPObject* r,
- std::vector<SPItem const *> const &it,
+void Inkscape::ObjectSnapper::_findCandidates(SPObject* parent,
+ std::vector<SPItem const *> const *it,
bool const &first_point,
- std::vector<NR::Point> &points_to_snap,
- DimensionToSnap const snap_dim) const
+ Geom::Rect const &bbox_to_snap,
+ DimensionToSnap const snap_dim,
+ bool const clip_or_mask,
+ Geom::Matrix const additional_affine) const // transformation of the item being clipped / masked
{
bool const c1 = (snap_dim == TRANSL_SNAP_XY) && ThisSnapperMightSnap();
bool const c2 = (snap_dim != TRANSL_SNAP_XY) && GuidesMightSnap();
- bool const c3 = points_to_snap.size() == 0;
- if (!(c1 || c2) || c3) {
+ if (!(c1 || c2)) {
return;
}
- SPDesktop const *desktop = SP_ACTIVE_DESKTOP;
-
if (first_point) {
_candidates->clear();
}
- NR::Maybe<NR::Rect> bbox = NR::Rect(); // a default NR::Rect is infinitely large
- NR::Coord t = getSnapperTolerance();
+ Geom::Rect bbox_to_snap_incl = bbox_to_snap; // _incl means: will include the snapper tolerance
+ bbox_to_snap_incl.expandBy(getSnapperTolerance()); // see?
- // When dragging a guide...
- NR::Point p_guide = points_to_snap[0];
- if (!getSnapperAlwaysSnap()) {
- bbox = NR::Rect(p_guide, p_guide); // bbox is now just a single point: p_guide
- bbox->growBy(t); // bbox width and height now measure 2x snapper tolerance
- // for angled guidelines the bbox is now larger than really needed
- // (up to sqrt(2) for 45 deg. guidelines) but we'll leave it like that
- } // else: use an infinitely large bbox to find candidates
-
- for (SPObject* o = sp_object_first_child(r); o != NULL; o = SP_OBJECT_NEXT(o)) {
- if (SP_IS_ITEM(o) && !SP_ITEM(o)->isLocked() && !desktop->itemIsHidden(SP_ITEM(o))) {
-
+ for (SPObject* o = sp_object_first_child(parent); o != NULL; o = SP_OBJECT_NEXT(o)) {
+ g_assert(_snapmanager->getDesktop() != NULL);
+ if (SP_IS_ITEM(o) && !SP_ITEM(o)->isLocked() && !(_snapmanager->getDesktop()->itemIsHidden(SP_ITEM(o)) && !clip_or_mask)) {
+ // Don't snap to locked items, and
+ // don't snap to hidden objects, unless they're a clipped path or a mask
/* See if this item is on the ignore list */
- std::vector<SPItem const *>::const_iterator i = it.begin();
- while (i != it.end() && *i != o) {
- i++;
+ std::vector<SPItem const *>::const_iterator i;
+ if (it != NULL) {
+ i = it->begin();
+ while (i != it->end() && *i != o) {
+ i++;
+ }
}
-
- if (i == it.end()) {
- /* See if the item is within range */
+
+ if (it == NULL || i == it->end()) {
+ SPItem *item = SP_ITEM(o);
+ Geom::Matrix transform = Geom::identity();
+ if (item) {
+ SPObject *obj = NULL;
+ if (clip_or_mask) { // If the current item is a clipping path or a mask
+ // then store the transformation of the clipped path or mask itself
+ // but also take into account the additional affine of the object
+ // being clipped / masked
+ transform = to_2geom(item->transform) * additional_affine;
+ } else { // cannot clip or mask more than once
+ // The current item is not a clipping path or a mask, but might
+ // still be the subject of clipping or masking itself ; if so, then
+ // we should also consider that path or mask for snapping to
+ obj = SP_OBJECT(item->clip_ref->getObject());
+ if (obj) {
+ _findCandidates(obj, it, false, bbox_to_snap, snap_dim, true, item->transform);
+ }
+ obj = SP_OBJECT(item->mask_ref->getObject());
+ if (obj) {
+ _findCandidates(obj, it, false, bbox_to_snap, snap_dim, true, item->transform);
+ }
+ }
+ }
+
if (SP_IS_GROUP(o)) {
- _findCandidates(o, it, false, points_to_snap, snap_dim);
+ _findCandidates(o, it, false, bbox_to_snap, snap_dim, false, Geom::identity());
} else {
- // Now let's see if any of the snapping points is within snapping range of this object
- if (snap_dim == TRANSL_SNAP_XY) {
- bbox = sp_item_bbox_desktop(SP_ITEM(o));
- } // else: we're snapping a guide to an object and we will use the bbox as defined above
-
- if (bbox) {
- for (std::vector<NR::Point>::const_iterator i = points_to_snap.begin(); i != points_to_snap.end(); i++) {
- NR::Point b_min = bbox->min();
- NR::Point b_max = bbox->max();
- bool withinX = ((*i)[NR::X] >= b_min[NR::X] - t) && ((*i)[NR::X] <= b_max[NR::X] + t);
- bool withinY = ((*i)[NR::Y] >= b_min[NR::Y] - t) && ((*i)[NR::Y] <= b_max[NR::Y] + t);
- if (withinX && withinY) {
- //We've found a point that is within snapping range
- //of this object, so record it as a candidate
- _candidates->push_back(SP_ITEM(o));
- break;
- }
- }
+ Geom::OptRect bbox_of_item = Geom::Rect();
+ if (clip_or_mask) {
+ // Oh oh, this will get ugly. We cannot use sp_item_i2d_affine directly because we need to
+ // insert an additional transformation in document coordinates (code copied from sp_item_i2d_affine)
+ sp_item_invoke_bbox(item,
+ bbox_of_item,
+ sp_item_i2doc_affine(item) * matrix_to_desktop(additional_affine, item),
+ true);
+ } else {
+ sp_item_invoke_bbox(item, bbox_of_item, sp_item_i2d_affine(item), true);
+ }
+ if (bbox_of_item) {
+ // See if the item is within range
+ if (bbox_to_snap_incl.intersects(*bbox_of_item)) {
+ // This item is within snapping range, so record it as a candidate
+ _candidates->push_back(SnapCandidate(item, clip_or_mask, additional_affine));
+ }
}
}
}
}
-void Inkscape::ObjectSnapper::_collectNodes(Inkscape::Snapper::PointType const &t,
+void Inkscape::ObjectSnapper::_collectNodes(Inkscape::SnapPreferences::PointType const &t,
bool const &first_point) const
{
// Now, let's first collect all points to snap to. If we have a whole bunch of points to snap,
@@ -148,40 +175,51 @@ void Inkscape::ObjectSnapper::_collectNodes(Inkscape::Snapper::PointType const &
// Determine the type of bounding box we should snap to
SPItem::BBoxType bbox_type = SPItem::GEOMETRIC_BBOX;
- bool p_is_a_node = t & Inkscape::Snapper::SNAPPOINT_NODE;
- bool p_is_a_bbox = t & Inkscape::Snapper::SNAPPOINT_BBOX;
- bool p_is_a_guide = t & Inkscape::Snapper::SNAPPOINT_GUIDE;
+ bool p_is_a_node = t & Inkscape::SnapPreferences::SNAPPOINT_NODE;
+ bool p_is_a_bbox = t & Inkscape::SnapPreferences::SNAPPOINT_BBOX;
+ bool p_is_a_guide = t & Inkscape::SnapPreferences::SNAPPOINT_GUIDE;
// A point considered for snapping should be either a node, a bbox corner or a guide. Pick only ONE!
- g_assert(!(p_is_a_node && p_is_a_bbox || p_is_a_bbox && p_is_a_guide || p_is_a_node && p_is_a_guide));
+ g_assert(!((p_is_a_node && p_is_a_bbox) || (p_is_a_bbox && p_is_a_guide) || (p_is_a_node && p_is_a_guide)));
if (_snap_to_bboxnode) {
- gchar const *prefs_bbox = prefs_get_string_attribute("tools", "bounding_box");
- bbox_type = (prefs_bbox != NULL && strcmp(prefs_bbox, "geometric")==0)? SPItem::GEOMETRIC_BBOX : SPItem::APPROXIMATE_BBOX;
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ bool prefs_bbox = prefs->getBool("/tools/bounding_box");
+ bbox_type = !prefs_bbox ?
+ SPItem::APPROXIMATE_BBOX : SPItem::GEOMETRIC_BBOX;
+ }
+
+ // Consider the page border for snapping
+ if (_snap_to_page_border) {
+ _getBorderNodes(_points_to_snap_to);
}
- for (std::vector<SPItem*>::const_iterator i = _candidates->begin(); i != _candidates->end(); i++) {
- //NR::Matrix i2doc(NR::identity());
- SPItem *root_item = *i;
- if (SP_IS_USE(*i)) {
- root_item = sp_use_root(SP_USE(*i));
+ for (std::vector<SnapCandidate>::const_iterator i = _candidates->begin(); i != _candidates->end(); i++) {
+ //Geom::Matrix i2doc(Geom::identity());
+ SPItem *root_item = (*i).item;
+ if (SP_IS_USE((*i).item)) {
+ root_item = sp_use_root(SP_USE((*i).item));
}
g_return_if_fail(root_item);
//Collect all nodes so we can snap to them
if (_snap_to_itemnode) {
if (!(_strict_snapping && !p_is_a_node) || p_is_a_guide) {
- sp_item_snappoints(root_item, _include_item_center, SnapPointsIter(*_points_to_snap_to));
+ sp_item_snappoints(root_item, SnapPointsIter(*_points_to_snap_to), &_snapmanager->snapprefs);
}
}
//Collect the bounding box's corners so we can snap to them
if (_snap_to_bboxnode) {
if (!(_strict_snapping && !p_is_a_bbox) || p_is_a_guide) {
- NR::Maybe<NR::Rect> b = sp_item_bbox_desktop(root_item, bbox_type);
- if (b) {
- for ( unsigned k = 0 ; k < 4 ; k++ ) {
- _points_to_snap_to->push_back(b->corner(k));
+ // Discard the bbox of a clipped path / mask, because we don't want to snap to both the bbox
+ // of the item AND the bbox of the clipping path at the same time
+ if (!(*i).clip_or_mask) {
+ Geom::OptRect b = sp_item_bbox_desktop(root_item, bbox_type);
+ if (b) {
+ for ( unsigned k = 0 ; k < 4 ; k++ ) {
+ _points_to_snap_to->push_back(b->corner(k));
+ }
}
}
}
@@ -191,10 +229,10 @@ void Inkscape::ObjectSnapper::_collectNodes(Inkscape::Snapper::PointType const &
}
void Inkscape::ObjectSnapper::_snapNodes(SnappedConstraints &sc,
- Inkscape::Snapper::PointType const &t,
- NR::Point const &p,
+ Inkscape::SnapPreferences::PointType const &t,
+ Geom::Point const &p,
bool const &first_point,
- std::vector<NR::Point> *unselected_nodes) const
+ std::vector<Geom::Point> *unselected_nodes) const
{
// Iterate through all nodes, find out which one is the closest to p, and snap to it!
SnappedPoint s;
bool success = false;
- for (std::vector<NR::Point>::const_iterator k = _points_to_snap_to->begin(); k != _points_to_snap_to->end(); k++) {
- NR::Coord dist = NR::L2(*k - p);
- if (dist < getSnapperTolerance() && dist < s.getDistance()) {
- s = SnappedPoint(*k, dist, getSnapperTolerance(), getSnapperAlwaysSnap());
+ for (std::vector<Geom::Point>::const_iterator k = _points_to_snap_to->begin(); k != _points_to_snap_to->end(); k++) {
+ Geom::Coord dist = Geom::L2(*k - p);
+ if (dist < getSnapperTolerance() && dist < s.getSnapDistance()) {
+ s = SnappedPoint(*k, SNAPTARGET_NODE, dist, getSnapperTolerance(), getSnapperAlwaysSnap(), true);
success = true;
}
}
if (success) {
- sc.points.push_back(s);
+ sc.points.push_back(s);
}
}
void Inkscape::ObjectSnapper::_snapTranslatingGuideToNodes(SnappedConstraints &sc,
- Inkscape::Snapper::PointType const &t,
- NR::Point const &p,
- NR::Point const &guide_normal) const
+ Inkscape::SnapPreferences::PointType const &t,
+ Geom::Point const &p,
+ Geom::Point const &guide_normal) const
{
// Iterate through all nodes, find out which one is the closest to this guide, and snap to it!
_collectNodes(t, true);
@@ -231,15 +269,15 @@ void Inkscape::ObjectSnapper::_snapTranslatingGuideToNodes(SnappedConstraints &s
SnappedPoint s;
bool success = false;
- NR::Coord tol = getSnapperTolerance();
+ Geom::Coord tol = getSnapperTolerance();
- for (std::vector<NR::Point>::const_iterator k = _points_to_snap_to->begin(); k != _points_to_snap_to->end(); k++) {
+ for (std::vector<Geom::Point>::const_iterator k = _points_to_snap_to->begin(); k != _points_to_snap_to->end(); k++) {
// Project each node (*k) on the guide line (running through point p)
- NR::Point p_proj = project_on_linesegment(*k, p, p + NR::rot90(guide_normal));
- NR::Coord dist = NR::L2(*k - p_proj); // distance from node to the guide
- NR::Coord dist2 = NR::L2(p - p_proj); // distance from projection of node on the guide, to the mouse location
- if ((dist < tol && dist2 < tol || getSnapperAlwaysSnap()) && dist < s.getDistance()) {
- s = SnappedPoint(*k, dist, tol, getSnapperAlwaysSnap());
+ Geom::Point p_proj = project_on_linesegment(*k, p, p + Geom::rot90(guide_normal));
+ Geom::Coord dist = Geom::L2(*k - p_proj); // distance from node to the guide
+ Geom::Coord dist2 = Geom::L2(p - p_proj); // distance from projection of node on the guide, to the mouse location
+ if ((dist < tol && dist2 < tol) || (getSnapperAlwaysSnap() && dist < s.getSnapDistance())) {
+ s = SnappedPoint(*k, SNAPTARGET_NODE, dist, tol, getSnapperAlwaysSnap(), true);
success = true;
}
}
@@ -249,9 +287,13 @@ void Inkscape::ObjectSnapper::_snapTranslatingGuideToNodes(SnappedConstraints &s
}
}
-void Inkscape::ObjectSnapper::_collectPaths(Inkscape::Snapper::PointType const &t,
- bool const &first_point,
- NArtBpath *border_bpath) const
+
+/**
+ * Returns index of first NR_END bpath in array.
+ */
+
+void Inkscape::ObjectSnapper::_collectPaths(Inkscape::SnapPreferences::PointType const &t,
+ bool const &first_point) const
{
// Now, let's first collect all paths to snap to. If we have a whole bunch of points to snap,
// e.g. when translating an item using the selector tool, then we will only do this for the
@@ -262,33 +304,38 @@ void Inkscape::ObjectSnapper::_collectPaths(Inkscape::Snapper::PointType const &
// Determine the type of bounding box we should snap to
SPItem::BBoxType bbox_type = SPItem::GEOMETRIC_BBOX;
- bool p_is_a_node = t & Inkscape::Snapper::SNAPPOINT_NODE;
+ bool p_is_a_node = t & Inkscape::SnapPreferences::SNAPPOINT_NODE;
if (_snap_to_bboxpath) {
- gchar const *prefs_bbox = prefs_get_string_attribute("tools", "bounding_box");
- bbox_type = (prefs_bbox != NULL && strcmp(prefs_bbox, "geometric")==0)? SPItem::GEOMETRIC_BBOX : SPItem::APPROXIMATE_BBOX;
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ int prefs_bbox = prefs->getBool("/tools/bounding_box", 0);
+ bbox_type = !prefs_bbox ?
+ SPItem::APPROXIMATE_BBOX : SPItem::GEOMETRIC_BBOX;
}
// Consider the page border for snapping
- if (border_bpath != NULL) {
- _bpaths_to_snap_to->push_back(border_bpath);
+ if (_snap_to_page_border) {
+ Geom::PathVector *border_path = _getBorderPathv();
+ if (border_path != NULL) {
+ _paths_to_snap_to->push_back(border_path);
+ }
}
- for (std::vector<SPItem*>::const_iterator i = _candidates->begin(); i != _candidates->end(); i++) {
+ for (std::vector<SnapCandidate>::const_iterator i = _candidates->begin(); i != _candidates->end(); i++) {
/* Transform the requested snap point to this item's coordinates */
- NR::Matrix i2doc(NR::identity());
+ Geom::Matrix i2doc(Geom::identity());
SPItem *root_item = NULL;
/* We might have a clone at hand, so make sure we get the root item */
- if (SP_IS_USE(*i)) {
- i2doc = sp_use_get_root_transform(SP_USE(*i));
- root_item = sp_use_root(SP_USE(*i));
+ if (SP_IS_USE((*i).item)) {
+ i2doc = sp_use_get_root_transform(SP_USE((*i).item));
+ root_item = sp_use_root(SP_USE((*i).item));
g_return_if_fail(root_item);
} else {
- i2doc = sp_item_i2doc_affine(*i);
- root_item = *i;
+ i2doc = sp_item_i2doc_affine((*i).item);
+ root_item = (*i).item;
}
-
+
//Build a list of all paths considered for snapping to
//Add the item's path to snap to
@@ -316,11 +363,10 @@ void Inkscape::ObjectSnapper::_collectPaths(Inkscape::Snapper::PointType const &
if (!very_lenghty_prose && !very_complex_path) {
SPCurve *curve = curve_for_item(root_item);
if (curve) {
- NArtBpath *bpath = bpath_for_curve(root_item, curve, true, true);
- _bpaths_to_snap_to->push_back(bpath);
- // Because we set doTransformation to true in bpath_for_curve, we
- // will get a dupe of the path, which must be freed at some point
- sp_curve_unref(curve);
+ // We will get our own copy of the path, which must be freed at some point
+ Geom::PathVector *borderpathv = pathvector_for_curve(root_item, curve, true, true, Geom::identity(), (*i).additional_affine);
+ _paths_to_snap_to->push_back(borderpathv); // Perhaps for speed, get a reference to the Geom::pathvector, and store the transformation besides it.
+ curve->unref();
}
}
}
@@ -329,10 +375,16 @@ void Inkscape::ObjectSnapper::_collectPaths(Inkscape::Snapper::PointType const &
//Add the item's bounding box to snap to
if (_snap_to_bboxpath) {
if (!(_strict_snapping && p_is_a_node)) {
- NRRect rect;
- sp_item_invoke_bbox(root_item, &rect, i2doc, TRUE, bbox_type);
- NArtBpath *bpath = nr_path_from_rect(rect);
- _bpaths_to_snap_to->push_back(bpath);
+ // Discard the bbox of a clipped path / mask, because we don't want to snap to both the bbox
+ // of the item AND the bbox of the clipping path at the same time
+ if (!(*i).clip_or_mask) {
+ Geom::OptRect rect;
+ sp_item_invoke_bbox(root_item, rect, i2doc, TRUE, bbox_type);
+ if (rect) {
+ Geom::PathVector *path = _getPathvFromRect(*rect);
+ _paths_to_snap_to->push_back(path);
+ }
+ }
}
}
}
@@ -340,29 +392,24 @@ void Inkscape::ObjectSnapper::_collectPaths(Inkscape::Snapper::PointType const &
}
void Inkscape::ObjectSnapper::_snapPaths(SnappedConstraints &sc,
- Inkscape::Snapper::PointType const &t,
- NR::Point const &p,
+ Inkscape::SnapPreferences::PointType const &t,
+ Geom::Point const &p,
bool const &first_point,
- std::vector<NR::Point> *unselected_nodes,
- SPPath const *selected_path,
- NArtBpath *border_bpath) const
+ std::vector<Geom::Point> *unselected_nodes,
+ SPPath const *selected_path) const
{
- _collectPaths(t, first_point, border_bpath);
+ _collectPaths(t, first_point);
// Now we can finally do the real snapping, using the paths collected above
- SnappedPoint s;
- bool success = false;
- /* FIXME: this seems like a hack. Perhaps Snappers should be
- ** in SPDesktop rather than SPNamedView?
- */
- SPDesktop const *desktop = SP_ACTIVE_DESKTOP;
- NR::Point const p_doc = desktop->dt2doc(p);
+ g_assert(_snapmanager->getDesktop() != NULL);
+ Geom::Point const p_doc = _snapmanager->getDesktop()->dt2doc(p);
bool const node_tool_active = _snap_to_itempath && selected_path != NULL;
if (first_point) {
- /* While editing a path in the node tool, findCandidates must ignore that path because
- * of the node snapping requirements (i.e. only unselected nodes must be snapable).
+ /* findCandidates() is used for snapping to both paths and nodes. It ignores the path that is
+ * currently being edited, because that path requires special care: when snapping to nodes
+ * only the unselected nodes of that path should be considered, and these will be passed on separately.
* This path must not be ignored however when snapping to the paths, so we add it here
* manually when applicable.
*
if (node_tool_active) {
SPCurve *curve = curve_for_item(SP_ITEM(selected_path));
if (curve) {
- NArtBpath *bpath = bpath_for_curve(SP_ITEM(selected_path), curve, true, true);
- _bpaths_to_snap_to->push_back(bpath);
- // Because we set doTransformation to true in bpath_for_curve, we
- // will get a dupe of the path, which must be freed at some point
- sp_curve_unref(curve);
+ Geom::PathVector *pathv = pathvector_for_curve(SP_ITEM(selected_path), curve, true, true, Geom::identity(), Geom::identity()); // We will get our own copy of the path, which must be freed at some point
+ _paths_to_snap_to->push_back(pathv);
+ curve->unref();
}
- }
- // Convert all bpaths to Paths, because here we really must have Paths
- // (whereas in _snapPathsConstrained we will use the original bpaths)
- for (std::vector<NArtBpath*>::const_iterator k = _bpaths_to_snap_to->begin(); k != _bpaths_to_snap_to->end(); k++) {
- Path *path = bpath_to_Path(*k);
- if (path) {
- path->ConvertWithBackData(0.01); //This is extremely time consuming!
- _paths_to_snap_to->push_back(path);
- }
}
}
- for (std::vector<Path*>::const_iterator k = _paths_to_snap_to->begin(); k != _paths_to_snap_to->end(); k++) {
- if (*k) {
- bool const being_edited = (node_tool_active && (*k) == _paths_to_snap_to->back());
- //if true then this path k is currently being edited in the node tool
+ for (std::vector<Geom::PathVector*>::const_iterator it_p = _paths_to_snap_to->begin(); it_p != _paths_to_snap_to->end(); it_p++) {
+ bool const being_edited = (node_tool_active && (*it_p) == _paths_to_snap_to->back());
+ //if true then this pathvector it_pv is currently being edited in the node tool
+
+ // char * svgd = sp_svg_write_path(**it_p);
+ // std::cout << "Dumping the pathvector: " << svgd << std::endl;
+
+ for(Geom::PathVector::iterator it_pv = (*it_p)->begin(); it_pv != (*it_p)->end(); ++it_pv) {
+ // Find a nearest point for each curve within this path
+ // n curves will return n time values with 0 <= t <= 1
+ std::vector<double> anp = (*it_pv).nearestPointPerCurve(p_doc);
- for (unsigned i = 1 ; i < (*k)->pts.size() ; i++) {
- NR::Point start_point;
- NR::Point end_point;
- NR::Maybe<Path::cut_position> o = NR::Nothing();
- if (being_edited) {
- /* If the path is being edited, then we will try to snap to each piece of the
- * path individually. We should only snap though to stationary pieces of the paths
+ std::vector<double>::const_iterator np = anp.begin();
+ unsigned int index = 0;
+ for (; np != anp.end(); np++, index++) {
+ Geom::Curve const *curve = &((*it_pv).at_index(index));
+ Geom::Point const sp_doc = curve->pointAt(*np);
+
+ bool c1 = true;
+ bool c2 = true;
+ if (being_edited) {
+ /* If the path is being edited, then we should only snap though to stationary pieces of the path
* and not to the pieces that are being dragged around. This way we avoid
* self-snapping. For this we check whether the nodes at both ends of the current
* piece are unselected; if they are then this piece must be stationary
*/
- unsigned piece = (*k)->pts[i].piece;
- // Example: a cubic spline is a single piece within a path; it will be drawn using
- // a polyline, which is described by the collection of lines between the points pts[i]
- (*k)->PointAt(piece, 0, start_point);
- (*k)->PointAt(piece, 1, end_point);
- start_point = desktop->doc2dt(start_point);
- end_point = desktop->doc2dt(end_point);
g_assert(unselected_nodes != NULL);
- bool c1 = isUnselectedNode(start_point, unselected_nodes);
- bool c2 = isUnselectedNode(end_point, unselected_nodes);
- if (c1 && c2) {
- o = get_nearest_position_on_Path(*k, p_doc, i);
- }
- } else {
- /* If the path is NOT being edited, then we will try to snap to the path as a
- * whole, so we need to do this only once and we will break out at the end of
- * this for-loop iteration */
- /* Look for the nearest position on this SPItem to our snap point */
- o = get_nearest_position_on_Path(*k, p_doc);
- (*k)->PointAt(o->piece, 0, start_point);
- (*k)->PointAt(o->piece, 1, end_point);
- start_point = desktop->doc2dt(start_point);
- end_point = desktop->doc2dt(end_point);
+ Geom::Point start_pt = _snapmanager->getDesktop()->doc2dt(curve->pointAt(0));
+ Geom::Point end_pt = _snapmanager->getDesktop()->doc2dt(curve->pointAt(1));
+ c1 = isUnselectedNode(start_pt, unselected_nodes);
+ c2 = isUnselectedNode(end_pt, unselected_nodes);
+ /* Unfortunately, this might yield false positives for coincident nodes. Inkscape might therefore mistakenly
+ * snap to path segments that are not stationary. There are at least two possible ways to overcome this:
+ * - Linking the individual nodes of the SPPath we have here, to the nodes of the NodePath::SubPath class as being
+ * used in sp_nodepath_selected_nodes_move. This class has a member variable called "selected". For this the nodes
+ * should be in the exact same order for both classes, so we can index them
+ * - Replacing the SPPath being used here by the the NodePath::SubPath class; but how?
+ */
}
- if (o && o->t >= 0 && o->t <= 1) {
- /* Convert the nearest point back to desktop coordinates */
- NR::Point const o_it = get_point_on_Path(*k, o->piece, o->t);
- NR::Point const o_dt = desktop->doc2dt(o_it);
- NR::Coord const dist = NR::L2(o_dt - p);
-
+ Geom::Point const sp_dt = _snapmanager->getDesktop()->doc2dt(sp_doc);
+ if (!being_edited || (c1 && c2)) {
+ Geom::Coord const dist = Geom::distance(sp_doc, p_doc);
if (dist < getSnapperTolerance()) {
- // if we snap to a straight line segment (within a path), then return this line segment
- if ((*k)->IsLineSegment(o->piece)) {
- sc.lines.push_back(Inkscape::SnappedLineSegment(o_dt, dist, getSnapperTolerance(), getSnapperAlwaysSnap(), start_point, end_point));
- } else {
- // for segments other than straight lines of a path, we'll return just the closest snapped point
- if (dist < s.getDistance()) {
- s = SnappedPoint(o_dt, dist, getSnapperTolerance(), getSnapperAlwaysSnap());
- success = true;
- }
- }
+ sc.curves.push_back(Inkscape::SnappedCurve(from_2geom(sp_dt), dist, getSnapperTolerance(), getSnapperAlwaysSnap(), false, curve));
}
- }
-
- // If the path is NOT being edited, then we will try to snap to the path as a whole
- // so we need to do this only once
- if (!being_edited) break;
- }
- }
- }
-
- if (success) {
- sc.points.push_back(s);
- }
+ }
+ }
+ } // End of: for (Geom::PathVector::iterator ....)
+ }
}
/* Returns true if point is coincident with one of the unselected nodes */
-bool Inkscape::ObjectSnapper::isUnselectedNode(NR::Point const &point, std::vector<NR::Point> const *unselected_nodes) const
+bool Inkscape::ObjectSnapper::isUnselectedNode(Geom::Point const &point, std::vector<Geom::Point> const *unselected_nodes) const
{
if (unselected_nodes == NULL) {
return false;
@@ -473,8 +488,8 @@ bool Inkscape::ObjectSnapper::isUnselectedNode(NR::Point const &point, std::vect
return false;
}
- for (std::vector<NR::Point>::const_iterator i = unselected_nodes->begin(); i != unselected_nodes->end(); i++) {
- if (NR::L2(point - *i) < 1e-4) {
+ for (std::vector<Geom::Point>::const_iterator i = unselected_nodes->begin(); i != unselected_nodes->end(); i++) {
+ if (Geom::L2(point - *i) < 1e-4) {
return true;
}
}
@@ -483,62 +498,55 @@ bool Inkscape::ObjectSnapper::isUnselectedNode(NR::Point const &point, std::vect
}
void Inkscape::ObjectSnapper::_snapPathsConstrained(SnappedConstraints &sc,
- Inkscape::Snapper::PointType const &t,
- NR::Point const &p,
+ Inkscape::SnapPreferences::PointType const &t,
+ Geom::Point const &p,
bool const &first_point,
ConstraintLine const &c) const
{
- // Consider the page's border for snapping to
- NArtBpath *border_bpath = _snap_to_page_border ? _getBorderBPath() : NULL;
-
- _collectPaths(t, first_point, border_bpath);
+ _collectPaths(t, first_point);
// Now we can finally do the real snapping, using the paths collected above
- /* FIXME: this seems like a hack. Perhaps Snappers should be
- ** in SPDesktop rather than SPNamedView?
- */
- SPDesktop const *desktop = SP_ACTIVE_DESKTOP;
- NR::Point const p_doc = desktop->dt2doc(p);
+ g_assert(_snapmanager->getDesktop() != NULL);
+ Geom::Point const p_doc = _snapmanager->getDesktop()->dt2doc(p);
- NR::Point direction_vector = c.getDirection();
+ Geom::Point direction_vector = c.getDirection();
if (!is_zero(direction_vector)) {
- direction_vector = NR::unit_vector(direction_vector);
+ direction_vector = Geom::unit_vector(direction_vector);
}
- NR::Point const p1_on_cl = c.hasPoint() ? c.getPoint() : p;
- NR::Point const p2_on_cl = p1_on_cl + direction_vector;
+ Geom::Point const p1_on_cl = c.hasPoint() ? c.getPoint() : p;
+ Geom::Point const p2_on_cl = p1_on_cl + direction_vector;
// The intersection point of the constraint line with any path,
// must lie within two points on the constraintline: p_min_on_cl and p_max_on_cl
// The distance between those points is twice the snapping tolerance
- NR::Point const p_proj_on_cl = project_on_linesegment(p, p1_on_cl, p2_on_cl);
- NR::Point const p_min_on_cl = desktop->dt2doc(p_proj_on_cl - getSnapperTolerance() * direction_vector);
- NR::Point const p_max_on_cl = desktop->dt2doc(p_proj_on_cl + getSnapperTolerance() * direction_vector);
+ Geom::Point const p_proj_on_cl = project_on_linesegment(p, p1_on_cl, p2_on_cl);
+ Geom::Point const p_min_on_cl = _snapmanager->getDesktop()->dt2doc(p_proj_on_cl - getSnapperTolerance() * direction_vector);
+ Geom::Point const p_max_on_cl = _snapmanager->getDesktop()->dt2doc(p_proj_on_cl + getSnapperTolerance() * direction_vector);
Geom::Path cl;
- cl.start(p_min_on_cl.to_2geom());
- cl.appendNew<Geom::LineSegment>(p_max_on_cl.to_2geom());
+ std::vector<Geom::Path> clv;
+ cl.start(p_min_on_cl);
+ cl.appendNew<Geom::LineSegment>(p_max_on_cl);
+ clv.push_back(cl);
- for (std::vector<NArtBpath*>::const_iterator k = _bpaths_to_snap_to->begin(); k != _bpaths_to_snap_to->end(); k++) {
+ for (std::vector<Geom::PathVector*>::const_iterator k = _paths_to_snap_to->begin(); k != _paths_to_snap_to->end(); k++) {
if (*k) {
- // convert a Path object (see src/livarot/Path.h) to a 2geom's path object (see 2geom/path.h)
- // TODO: (Diederik) Only do this once for the first point, needs some storage of pointers in a member variable
- std::vector<Geom::Path> path_2geom = BPath_to_2GeomPath(*k);
-
- for (std::vector<Geom::Path>::const_iterator l = path_2geom.begin(); l != path_2geom.end(); l++) {
- Geom::SimpleCrosser sxr;
- Geom::Crossings crossings = sxr.crossings(*l, cl);
- for (std::vector<Geom::Crossing>::const_iterator m = crossings.begin(); m != crossings.end(); m++) {
- // Reconstruct the point of intersection
- NR::Point p_inters = p_min_on_cl + ((*m).tb) * (p_max_on_cl - p_min_on_cl);
- // When it's within snapping range, then return it
- // (within snapping range == between p_min_on_cl and p_max_on_cl == 0 < tb < 1)
- if ((*m).tb >= 0 && (*m).tb <= 1 ) {
- NR::Coord dist = NR::L2(desktop->dt2doc(p_proj_on_cl) - p_inters);
- SnappedPoint s(desktop->doc2dt(p_inters), dist, getSnapperTolerance(), getSnapperAlwaysSnap());
- sc.points.push_back(s);
+ Geom::CrossingSet cs = Geom::crossings(clv, *(*k));
+ if (cs.size() > 0) {
+ // We need only the first element of cs, because cl is only a single straight linesegment
+ // This first element contains a vector filled with crossings of cl with *k
+ for (std::vector<Geom::Crossing>::const_iterator m = cs[0].begin(); m != cs[0].end(); m++) {
+ if ((*m).ta >= 0 && (*m).ta <= 1 ) {
+ // Reconstruct the point of intersection
+ Geom::Point p_inters = p_min_on_cl + ((*m).ta) * (p_max_on_cl - p_min_on_cl);
+ // When it's within snapping range, then return it
+ // (within snapping range == between p_min_on_cl and p_max_on_cl == 0 < ta < 1)
+ Geom::Coord dist = Geom::L2(_snapmanager->getDesktop()->dt2doc(p_proj_on_cl) - p_inters);
+ SnappedPoint s(_snapmanager->getDesktop()->doc2dt(p_inters), SNAPTARGET_PATH, dist, getSnapperTolerance(), getSnapperAlwaysSnap(), true);
+ sc.points.push_back(s);
}
}
}
}
-void Inkscape::ObjectSnapper::_doFreeSnap(SnappedConstraints &sc,
- Inkscape::Snapper::PointType const &t,
- NR::Point const &p,
+void Inkscape::ObjectSnapper::freeSnap(SnappedConstraints &sc,
+ Inkscape::SnapPreferences::PointType const &t,
+ Geom::Point const &p,
bool const &first_point,
- std::vector<NR::Point> &points_to_snap,
- std::vector<SPItem const *> const &it,
- std::vector<NR::Point> *unselected_nodes) const
+ Geom::OptRect const &bbox_to_snap,
+ std::vector<SPItem const *> const *it,
+ std::vector<Geom::Point> *unselected_nodes) const
{
- if ( NULL == _named_view ) {
+ if (_snap_enabled == false || _snapmanager->snapprefs.getSnapFrom(t) == false ) {
return;
}
/* Get a list of all the SPItems that we will try to snap to */
if (first_point) {
- _findCandidates(sp_document_root(_named_view->document), it, first_point, points_to_snap, TRANSL_SNAP_XY);
+ Geom::Rect const local_bbox_to_snap = bbox_to_snap ? *bbox_to_snap : Geom::Rect(p, p);
+ _findCandidates(sp_document_root(_snapmanager->getDocument()), it, first_point, local_bbox_to_snap, TRANSL_SNAP_XY, false, Geom::identity());
}
- if (_snap_to_itemnode || _snap_to_bboxnode) {
+ if (_snap_to_itemnode || _snap_to_bboxnode || _snap_to_page_border) {
_snapNodes(sc, t, p, first_point, unselected_nodes);
}
- // Consider the page's border for snapping to
- NArtBpath *border_bpath = _snap_to_page_border ? _getBorderBPath() : NULL;
-
if (_snap_to_itempath || _snap_to_bboxpath || _snap_to_page_border) {
unsigned n = (unselected_nodes == NULL) ? 0 : unselected_nodes->size();
if (n > 0) {
* of the node snapping requirements (i.e. only unselected nodes must be snapable).
* That path must not be ignored however when snapping to the paths, so we add it here
* manually when applicable
- */
- g_assert(it.size() == 1);
- g_assert(SP_IS_PATH(*it.begin()));
- _snapPaths(sc, t, p, first_point, unselected_nodes, SP_PATH(*it.begin()), border_bpath);
+ */
+ SPPath *path = NULL;
+ if (it != NULL) {
+ g_assert(SP_IS_PATH(*it->begin()));
+ g_assert(it->size() == 1);
+ path = SP_PATH(*it->begin());
+ }
+ _snapPaths(sc, t, p, first_point, unselected_nodes, path);
} else {
- _snapPaths(sc, t, p, first_point, NULL, NULL, border_bpath);
+ _snapPaths(sc, t, p, first_point, NULL, NULL);
}
}
}
-void Inkscape::ObjectSnapper::_doConstrainedSnap( SnappedConstraints &sc,
- Inkscape::Snapper::PointType const &t,
- NR::Point const &p,
+void Inkscape::ObjectSnapper::constrainedSnap( SnappedConstraints &sc,
+ Inkscape::SnapPreferences::PointType const &t,
+ Geom::Point const &p,
bool const &first_point,
- std::vector<NR::Point> &points_to_snap,
+ Geom::OptRect const &bbox_to_snap,
ConstraintLine const &c,
- std::vector<SPItem const *> const &it) const
+ std::vector<SPItem const *> const *it) const
{
- if ( NULL == _named_view ) {
+ if (_snap_enabled == false || _snapmanager->snapprefs.getSnapFrom(t) == false) {
return;
}
/* Get a list of all the SPItems that we will try to snap to */
if (first_point) {
- _findCandidates(sp_document_root(_named_view->document), it, first_point, points_to_snap, TRANSL_SNAP_XY);
+ Geom::Rect const local_bbox_to_snap = bbox_to_snap ? *bbox_to_snap : Geom::Rect(p, p);
+ _findCandidates(sp_document_root(_snapmanager->getDocument()), it, first_point, local_bbox_to_snap, TRANSL_SNAP_XY, false, Geom::identity());
}
// A constrained snap, is a snap in only one degree of freedom (specified by the constraint line).
// This method is used to snap a guide to nodes, while dragging the guide around
void Inkscape::ObjectSnapper::guideSnap(SnappedConstraints &sc,
- NR::Point const &p,
- NR::Point const &guide_normal) const
+ Geom::Point const &p,
+ Geom::Point const &guide_normal) const
{
- if ( NULL == _named_view ) {
- return;
- }
-
/* Get a list of all the SPItems that we will try to snap to */
std::vector<SPItem*> cand;
std::vector<SPItem const *> const it; //just an empty list
-
- std::vector<NR::Point> points_to_snap;
- points_to_snap.push_back(p);
-
+
DimensionToSnap snap_dim;
- if (guide_normal == component_vectors[NR::Y]) {
+ if (guide_normal == to_2geom(component_vectors[Geom::Y])) {
snap_dim = GUIDE_TRANSL_SNAP_Y;
- } else if (guide_normal == component_vectors[NR::X]) {
+ } else if (guide_normal == to_2geom(component_vectors[Geom::X])) {
snap_dim = GUIDE_TRANSL_SNAP_X;
} else {
snap_dim = ANGLED_GUIDE_TRANSL_SNAP;
}
+
// We don't support ANGLED_GUIDE_ROT_SNAP yet.
// It would be cool to allow the user to rotate a guide by dragging it, instead of
// or a transformation center (which can be moved after clicking for the
// second time on an object; but should this point then be constrained to the
// line, or can it be located anywhere?)
-
- _findCandidates(sp_document_root(_named_view->document), it, true, points_to_snap, snap_dim);
- _snapTranslatingGuideToNodes(sc, Inkscape::Snapper::SNAPPOINT_GUIDE, p, guide_normal);
+ _findCandidates(sp_document_root(_snapmanager->getDocument()), &it, true, Geom::Rect(p, p), snap_dim, false, Geom::identity());
+ _snapTranslatingGuideToNodes(sc, Inkscape::SnapPreferences::SNAPPOINT_GUIDE, p, guide_normal);
// _snapRotatingGuideToNodes has not been implemented yet.
}
bool Inkscape::ObjectSnapper::ThisSnapperMightSnap() const
{
bool snap_to_something = _snap_to_itempath || _snap_to_itemnode || _snap_to_bboxpath || _snap_to_bboxnode || _snap_to_page_border;
- return (_snap_enabled && _snap_from != 0 && snap_to_something);
+ return (_snap_enabled && _snapmanager->snapprefs.getSnapModeBBoxOrNodes() && snap_to_something);
}
bool Inkscape::ObjectSnapper::GuidesMightSnap() const
{
bool snap_to_something = _snap_to_itemnode || _snap_to_bboxnode;
- return (_snap_enabled && (_snap_from & SNAPPOINT_GUIDE) && snap_to_something);
+ return (_snap_enabled && _snapmanager->snapprefs.getSnapModeGuide() && snap_to_something);
}
void Inkscape::ObjectSnapper::_clear_paths() const
{
- for (std::vector<NArtBpath*>::const_iterator k = _bpaths_to_snap_to->begin(); k != _bpaths_to_snap_to->end(); k++) {
+ for (std::vector<Geom::PathVector*>::const_iterator k = _paths_to_snap_to->begin(); k != _paths_to_snap_to->end(); k++) {
g_free(*k);
}
- _bpaths_to_snap_to->clear();
-
- for (std::vector<Path*>::const_iterator k = _paths_to_snap_to->begin(); k != _paths_to_snap_to->end(); k++) {
- delete *k;
- }
_paths_to_snap_to->clear();
}
-NArtBpath* Inkscape::ObjectSnapper::_getBorderBPath() const
+Geom::PathVector* Inkscape::ObjectSnapper::_getBorderPathv() const
+{
+ Geom::Rect const border_rect = Geom::Rect(Geom::Point(0,0), Geom::Point(sp_document_width(_snapmanager->getDocument()),sp_document_height(_snapmanager->getDocument())));
+ return _getPathvFromRect(border_rect);
+}
+
+Geom::PathVector* Inkscape::ObjectSnapper::_getPathvFromRect(Geom::Rect const rect) const
{
- NArtBpath *border_bpath = NULL;
- NR::Rect const border_rect = NR::Rect(NR::Point(0,0), NR::Point(sp_document_width(_named_view->document),sp_document_height(_named_view->document)));
- SPCurve const *border_curve = sp_curve_new_from_rect(border_rect);
+ SPCurve const *border_curve = SPCurve::new_from_rect(rect);
if (border_curve) {
- border_bpath = SP_CURVE_BPATH(border_curve);
- }
-
- return border_bpath;
+ Geom::PathVector *dummy = new Geom::PathVector(border_curve->get_pathvector());
+ return dummy;
+ } else {
+ return NULL;
+ }
}
+
+void Inkscape::ObjectSnapper::_getBorderNodes(std::vector<Geom::Point> *points) const
+{
+ Geom::Coord w = sp_document_width(_snapmanager->getDocument());
+ Geom::Coord h = sp_document_height(_snapmanager->getDocument());
+ points->push_back(Geom::Point(0,0));
+ points->push_back(Geom::Point(0,h));
+ points->push_back(Geom::Point(w,h));
+ points->push_back(Geom::Point(w,0));
+}
+
/*
Local Variables:
mode:c++