X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fobject-snapper.cpp;h=7d79a5e91a7aa0686dd66cf8694604aad3acb154;hb=76ed722031d5028acba4392554558ad9df9e26ce;hp=c928d43d37fba450a3a25276aa36ee4b031ea651;hpb=2b3cabe179b4499adc82f3834ea498b4a52cbe0d;p=inkscape.git diff --git a/src/object-snapper.cpp b/src/object-snapper.cpp index c928d43d3..7d79a5e91 100644 --- a/src/object-snapper.cpp +++ b/src/object-snapper.cpp @@ -11,14 +11,11 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "libnr/n-art-bpath.h" -#include "libnr/nr-path.h" -#include "libnr/nr-rect-ops.h" -#include "libnr/nr-point-fns.h" -#include "libnr/n-art-bpath-2geom.h" +#include "svg/svg.h" #include <2geom/path-intersection.h> #include <2geom/point.h> #include <2geom/rect.h> +#include <2geom/line.h> #include "document.h" #include "sp-namedview.h" #include "sp-image.h" @@ -26,27 +23,27 @@ #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::ObjectSnapper::ObjectSnapper(SPNamedView const *nv, NR::Coord const d) - : Snapper(nv, 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) +Inkscape::ObjectSnapper::ObjectSnapper(SnapManager *sm, Geom::Coord const d) + : Snapper(sm, d) { - _candidates = new std::vector; - _points_to_snap_to = new std::vector; - _bpaths_to_snap_to = new std::vector; - _paths_to_snap_to = new std::vector; + _candidates = new std::vector; + _points_to_snap_to = new std::vector; + _paths_to_snap_to = new std::vector; } 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(); @@ -54,44 +51,58 @@ Inkscape::ObjectSnapper::~ObjectSnapper() _clear_paths(); delete _paths_to_snap_to; - delete _bpaths_to_snap_to; +} + +/** + * \return Snap tolerance (desktop coordinates); depends on current zoom so that it's always the same in screen pixels + */ +Geom::Coord Inkscape::ObjectSnapper::getSnapperTolerance() const +{ + SPDesktop const *dt = _snapmanager->getDesktop(); + double const zoom = dt ? dt->current_zoom() : 1; + return _snapmanager->snapprefs.getObjectTolerance() / zoom; +} + +bool Inkscape::ObjectSnapper::getSnapperAlwaysSnap() const +{ + return _snapmanager->snapprefs.getObjectTolerance() == 10000; //TODO: Replace this threshold of 10000 by a constant; see also tolerance-slider.cpp } /** * 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 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, +void Inkscape::ObjectSnapper::_findCandidates(SPObject* parent, std::vector const *it, bool const &first_point, - NR::Rect const &bbox_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(); - + if (!(c1 || c2)) { - return; + return; } - - SPDesktop const *desktop = SP_ACTIVE_DESKTOP; if (first_point) { _candidates->clear(); } - - NR::Maybe bbox_of_item = NR::Rect(); // a default NR::Rect is infinitely large - NR::Rect bbox_to_snap_incl = bbox_to_snap; // _incl means: will include the snapper tolerance - bbox_to_snap_incl.growBy(getSnapperTolerance()); // see? - - 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))) { + Geom::Rect bbox_to_snap_incl = bbox_to_snap; // _incl means: will include the snapper tolerance + bbox_to_snap_incl.expandBy(getSnapperTolerance()); // see? + + 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) && !(_snapmanager->getDesktop()->itemIsHidden(SP_ITEM(o)) && !clip_or_mask)) { + // Snapping to items in a locked layer is allowed + // 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::const_iterator i; if (it != NULL) { @@ -102,15 +113,46 @@ void Inkscape::ObjectSnapper::_findCandidates(SPObject* r, } if (it == NULL || i == it->end()) { - /* See if the item is within range */ + SPItem *item = SP_ITEM(o); + if (item) { + SPObject *obj = NULL; + if (!clip_or_mask) { // 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, sp_item_i2doc_affine(item)); + } + obj = SP_OBJECT(item->mask_ref->getObject()); + if (obj) { + _findCandidates(obj, it, false, bbox_to_snap, snap_dim, true, sp_item_i2doc_affine(item)); + } + } + } + if (SP_IS_GROUP(o)) { - _findCandidates(o, it, false, bbox_to_snap, snap_dim); + _findCandidates(o, it, false, bbox_to_snap, snap_dim, clip_or_mask, additional_affine); } else { - bbox_of_item = sp_item_bbox_desktop(SP_ITEM(o)); + 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) * additional_affine * _snapmanager->getDesktop()->doc2dt(), + 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(SP_ITEM(o)); + // This item is within snapping range, so record it as a candidate + _candidates->push_back(SnapCandidateItem(item, clip_or_mask, additional_affine)); + // For debugging: print the id of the candidate to the console + //SPObject *obj = (SPObject*)item; + //std::cout << "Snap candidate added: " << obj->id << std::endl; } } } @@ -120,55 +162,85 @@ void Inkscape::ObjectSnapper::_findCandidates(SPObject* r, } -void Inkscape::ObjectSnapper::_collectNodes(Inkscape::Snapper::PointType const &t, - bool const &first_point) const +void Inkscape::ObjectSnapper::_collectNodes(Inkscape::SnapSourceType 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, // e.g. when translating an item using the selector tool, then we will only do this for the // first point and store the collection for later use. This significantly improves the performance if (first_point) { _points_to_snap_to->clear(); - + // 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::SNAPSOURCE_NODE_CATEGORY; + bool p_is_a_bbox = t & Inkscape::SNAPSOURCE_BBOX_CATEGORY; + bool p_is_other = t & Inkscape::SNAPSOURCE_OTHER_CATEGORY; + // 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)); - - if (_snap_to_bboxnode) { - int prefs_bbox = prefs_get_int_attribute("tools", "bounding_box", 0); - bbox_type = (prefs_bbox ==0)? + g_assert(!((p_is_a_node && p_is_a_bbox) || (p_is_a_bbox && p_is_other) || (p_is_a_node && p_is_other))); + + if (_snapmanager->snapprefs.getSnapToBBoxNode() || _snapmanager->snapprefs.getSnapBBoxEdgeMidpoints() || _snapmanager->snapprefs.getSnapBBoxMidpoints()) { + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + bool prefs_bbox = prefs->getBool("/tools/bounding_box"); + bbox_type = !prefs_bbox ? SPItem::APPROXIMATE_BBOX : SPItem::GEOMETRIC_BBOX; } - for (std::vector::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)); + // Consider the page border for snapping to + if (_snapmanager->snapprefs.getSnapToPageBorder()) { + _getBorderNodes(_points_to_snap_to); + } + + for (std::vector::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)); + if (p_is_a_node || !(_snapmanager->snapprefs.getStrictSnapping() && !p_is_a_node) || p_is_other) { + // Note: there are two ways in which intersections are considered: + // Method 1: Intersections are calculated for each shape individually, for both the + // snap source and snap target (see sp_shape_snappoints) + // Method 2: Intersections are calculated for each curve or line that we've snapped to, i.e. only for + // the target (see the intersect() method in the SnappedCurve and SnappedLine classes) + // Some differences: + // - Method 1 doesn't find intersections within a set of multiple objects + // - Method 2 only works for targets + // When considering intersections as snap targets: + // - Method 1 only works when snapping to nodes, whereas + // - Method 2 only works when snapping to paths + // - There will be performance differences too! + // If both methods are being used simultaneously, then this might lead to duplicate targets! + + // Well, here we will be looking for snap TARGETS. Both methods can therefore be used. + // When snapping to paths, we will get a collection of snapped lines and snapped curves. findBestSnap() will + // go hunting for intersections (but only when asked to in the prefs of course). In that case we can just + // temporarily block the intersections in sp_item_snappoints, we don't need duplicates. If we're not snapping to + // paths though but only to item nodes then we should still look for the intersections in sp_item_snappoints() + bool old_pref = _snapmanager->snapprefs.getSnapIntersectionCS(); + if (_snapmanager->snapprefs.getSnapToItemPath()) { + _snapmanager->snapprefs.setSnapIntersectionCS(false); + } + + sp_item_snappoints(root_item, *_points_to_snap_to, &_snapmanager->snapprefs); + + if (_snapmanager->snapprefs.getSnapToItemPath()) { + _snapmanager->snapprefs.setSnapIntersectionCS(old_pref); } } //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 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)); - } - } + if (p_is_a_bbox || !(_snapmanager->snapprefs.getStrictSnapping() && !p_is_a_bbox) || p_is_other) { + // 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); + getBBoxPoints(b, _points_to_snap_to, true, _snapmanager->snapprefs.getSnapToBBoxNode(), _snapmanager->snapprefs.getSnapBBoxEdgeMidpoints(), _snapmanager->snapprefs.getSnapBBoxMidpoints()); } } } @@ -176,130 +248,118 @@ void Inkscape::ObjectSnapper::_collectNodes(Inkscape::Snapper::PointType const & } void Inkscape::ObjectSnapper::_snapNodes(SnappedConstraints &sc, - Inkscape::Snapper::PointType const &t, - NR::Point const &p, - bool const &first_point, - std::vector *unselected_nodes) const + Inkscape::SnapCandidatePoint const &p, + std::vector *unselected_nodes) const { // Iterate through all nodes, find out which one is the closest to p, and snap to it! - - _collectNodes(t, first_point); - + + _collectNodes(p.getSourceType(), p.getSourceNum() == 0); + if (unselected_nodes != NULL) { _points_to_snap_to->insert(_points_to_snap_to->end(), unselected_nodes->begin(), unselected_nodes->end()); - } - + } + SnappedPoint s; bool success = false; - - for (std::vector::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, SNAPTARGET_NODE, dist, getSnapperTolerance(), getSnapperAlwaysSnap()); + + for (std::vector::const_iterator k = _points_to_snap_to->begin(); k != _points_to_snap_to->end(); k++) { + Geom::Coord dist = Geom::L2((*k).getPoint() - p.getPoint()); + if (dist < getSnapperTolerance() && dist < s.getSnapDistance()) { + s = SnappedPoint((*k).getPoint(), p.getSourceType(), p.getSourceNum(), (*k).getTargetType(), dist, getSnapperTolerance(), getSnapperAlwaysSnap(), true, (*k).getTargetBBox()); 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 + 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); - + _collectNodes(SNAPSOURCE_GUIDE, true); + + // Although we won't snap to paths here (which would give us under constrained snaps) we can still snap to intersections of paths. + if (_snapmanager->snapprefs.getSnapToItemPath() || _snapmanager->snapprefs.getSnapToBBoxPath() || _snapmanager->snapprefs.getSnapToPageBorder()) { + _collectPaths(Inkscape::SnapCandidatePoint(p, SNAPSOURCE_GUIDE), true); + _snapPaths(sc, Inkscape::SnapCandidatePoint(p, SNAPSOURCE_GUIDE), NULL, NULL); + // The paths themselves should be discarded in findBestSnap(), as we should only snap to their intersections + } + SnappedPoint s; - bool success = false; - - NR::Coord tol = getSnapperTolerance(); - - for (std::vector::const_iterator k = _points_to_snap_to->begin(); k != _points_to_snap_to->end(); k++) { + + Geom::Coord tol = getSnapperTolerance(); + + for (std::vector::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, SNAPTARGET_NODE, dist, tol, getSnapperAlwaysSnap()); - success = true; + Geom::Point p_proj = Geom::projection((*k).getPoint(), Geom::Line(p, p + Geom::rot90(guide_normal))); + Geom::Coord dist = Geom::L2((*k).getPoint() - 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()) { + s = SnappedPoint((*k).getPoint(), SNAPSOURCE_GUIDE, 0, (*k).getTargetType(), dist, tol, getSnapperAlwaysSnap(), true, (*k).getTargetBBox()); + sc.points.push_back(s); } } - - if (success) { - sc.points.push_back(s); - } } + /** * Returns index of first NR_END bpath in array. */ -static unsigned sp_bpath_length(NArtBpath const bpath[]) -{ - g_return_val_if_fail(bpath != NULL, FALSE); - unsigned ret = 0; - while ( bpath[ret].code != NR_END ) { - ++ret; - } - ++ret; - return ret; -} -void Inkscape::ObjectSnapper::_collectPaths(Inkscape::Snapper::PointType const &t, - bool const &first_point, - NArtBpath const *border_bpath) const +void Inkscape::ObjectSnapper::_collectPaths(Inkscape::SnapCandidatePoint const &p, + 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 // first point and store the collection for later use. This significantly improves the performance if (first_point) { _clear_paths(); - + // 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; - - if (_snap_to_bboxpath) { - int prefs_bbox = prefs_get_int_attribute("tools", "bounding_box", 0); - bbox_type = (prefs_bbox ==0)? + + bool p_is_a_node = p.getSourceType() & Inkscape::SNAPSOURCE_NODE_CATEGORY; + bool p_is_other = p.getSourceType() & Inkscape::SNAPSOURCE_OTHER_CATEGORY; + + if (_snapmanager->snapprefs.getSnapToBBoxPath()) { + 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) { - // make our own copy of the const* - NArtBpath *new_bpath; - unsigned const len = sp_bpath_length(border_bpath); - new_bpath = g_new(NArtBpath, len); - memcpy(new_bpath, border_bpath, len * sizeof(NArtBpath)); - - _bpaths_to_snap_to->push_back(new_bpath); + if (_snapmanager->snapprefs.getSnapToPageBorder()) { + Geom::PathVector *border_path = _getBorderPathv(); + if (border_path != NULL) { + _paths_to_snap_to->push_back(Inkscape::SnapCandidatePath(border_path, SNAPTARGET_PAGE_BORDER, Geom::OptRect())); + } } - - for (std::vector::const_iterator i = _candidates->begin(); i != _candidates->end(); i++) { + + for (std::vector::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 = from_2geom(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 - if (_snap_to_itempath) { - if (!(_strict_snapping && !p_is_a_node)) { + if (_snapmanager->snapprefs.getSnapToItemPath()) { + if (p_is_other || !(_snapmanager->snapprefs.getStrictSnapping() && !p_is_a_node)) { // Snapping to the path of characters is very cool, but for a large // chunk of text this will take ages! So limit snapping to text paths // containing max. 240 characters. Snapping the bbox will not be affected @@ -320,10 +380,11 @@ void Inkscape::ObjectSnapper::_collectPaths(Inkscape::Snapper::PointType const & } if (!very_lenghty_prose && !very_complex_path) { - SPCurve *curve = curve_for_item(root_item); + SPCurve *curve = curve_for_item(root_item); if (curve) { - NArtBpath *bpath = bpath_for_curve(root_item, curve, true, true); // perhaps for speed, get a reference to the Geom::pathvector, and store the transformation besides it. apply transformation on the snap points, instead of generating whole new path - _bpaths_to_snap_to->push_back(bpath); // we will get a dupe of the path, which must be freed at some point + // 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(Inkscape::SnapCandidatePath(borderpathv, SNAPTARGET_PATH, Geom::OptRect())); // Perhaps for speed, get a reference to the Geom::pathvector, and store the transformation besides it. curve->unref(); } } @@ -331,229 +392,171 @@ 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); + if (_snapmanager->snapprefs.getSnapToBBoxPath()) { + if (p_is_other || !(_snapmanager->snapprefs.getStrictSnapping() && p_is_a_node)) { + // 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); + rect = sp_item_bbox_desktop(root_item, bbox_type); + _paths_to_snap_to->push_back(Inkscape::SnapCandidatePath(path, SNAPTARGET_BBOX_EDGE, rect)); + } + } } } } } } - + void Inkscape::ObjectSnapper::_snapPaths(SnappedConstraints &sc, - Inkscape::Snapper::PointType const &t, - NR::Point const &p, - bool const &first_point, - std::vector *unselected_nodes, - SPPath const *selected_path, - NArtBpath const *border_bpath) const + Inkscape::SnapCandidatePoint const &p, + std::vector *unselected_nodes, + SPPath const *selected_path) const { - _collectPaths(t, first_point, border_bpath); + _collectPaths(p, p.getSourceNum() == 0); // 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); - - 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). + + g_assert(_snapmanager->getDesktop() != NULL); + Geom::Point const p_doc = _snapmanager->getDesktop()->dt2doc(p.getPoint()); + + bool const node_tool_active = _snapmanager->snapprefs.getSnapToItemPath() && selected_path != NULL; + + if (p.getSourceNum() == 0) { + /* 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. - * - * Note that this path must be the last in line! - * */ - if (node_tool_active) { - SPCurve *curve = curve_for_item(SP_ITEM(selected_path)); + * 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); // we will get a dupe of the path, which must be freed at some point + 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(Inkscape::SnapCandidatePath(pathv, SNAPTARGET_PATH, Geom::OptRect(), true)); 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::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::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 (unsigned i = 1 ; i < (*k)->pts.size() ; i++) { - //pts describes a polyline approximation, which might consist of 1000s of points! - NR::Point start_point; - NR::Point end_point; - NR::Maybe 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 - * and not to the pieces that are being dragged around. This way we avoid + + for (std::vector::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).currently_being_edited; + //if true then this pathvector it_pv is currently being edited in the node tool + + for(Geom::PathVector::iterator it_pv = (it_p->path_vector)->begin(); it_pv != (it_p->path_vector)->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 anp = (*it_pv).nearestPointPerCurve(p_doc); + + std::vector::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); + * piece are unselected; if they are then this piece must be stationary + */ 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); - } - - 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); - - /* IF YOU'RE BUG HUNTING: IT LOOKS LIKE get_point_on_Path SOMETIMES - * RETURNS THE WRONG POINT (WITH AN OFFSET, BUT STILL ON THE PATH. - * THIS BUG WILL NO LONGER BE ENCOUNTERED ONCE WE'VE SWITCHED TO - * 2GEOM FOR THE OBJECT SNAPPER + 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? */ - - 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, SNAPTARGET_PATH, dist, getSnapperTolerance(), getSnapperAlwaysSnap()); - success = true; - } - } + sc.curves.push_back(Inkscape::SnappedCurve(sp_dt, dist, getSnapperTolerance(), getSnapperAlwaysSnap(), false, curve, p.getSourceType(), p.getSourceNum(), it_p->target_type, it_p->target_bbox)); } - } - - // 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 const *unselected_nodes) const +/* Returns true if point is coincident with one of the unselected nodes */ +bool Inkscape::ObjectSnapper::isUnselectedNode(Geom::Point const &point, std::vector const *unselected_nodes) const { if (unselected_nodes == NULL) { return false; } - + if (unselected_nodes->size() == 0) { return false; } - - for (std::vector::const_iterator i = unselected_nodes->begin(); i != unselected_nodes->end(); i++) { - if (NR::L2(point - *i) < 1e-4) { + + for (std::vector::const_iterator i = unselected_nodes->begin(); i != unselected_nodes->end(); i++) { + if (Geom::L2(point - (*i).getPoint()) < 1e-4) { return true; - } - } - - return false; + } + } + + return false; } void Inkscape::ObjectSnapper::_snapPathsConstrained(SnappedConstraints &sc, - Inkscape::Snapper::PointType const &t, - NR::Point const &p, - bool const &first_point, + Inkscape::SnapCandidatePoint const &p, ConstraintLine const &c) const { - - // Consider the page's border for snapping to - NArtBpath const *border_bpath = _snap_to_page_border ? _getBorderBPath() : NULL; - - _collectPaths(t, first_point, border_bpath); - + + _collectPaths(p, p.getSourceNum() == 0); + // 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); - - NR::Point direction_vector = c.getDirection(); + + g_assert(_snapmanager->getDesktop() != NULL); + Geom::Point const p_doc = _snapmanager->getDesktop()->dt2doc(p.getPoint()); + + 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; - - // The intersection point of the constraint line with any path, + + // 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 = p.getPoint(); // projection has already been taken care of in constrainedSnap in the snapmanager; + 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; - std::vector clv; - cl.start(p_min_on_cl.to_2geom()); - cl.appendNew(p_max_on_cl.to_2geom()); + std::vector clv; + cl.start(p_min_on_cl); + cl.appendNew(p_max_on_cl); clv.push_back(cl); - - for (std::vector::const_iterator k = _bpaths_to_snap_to->begin(); k != _bpaths_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 path_2geom = BPath_to_2GeomPath(*k); - - Geom::CrossingSet cs = Geom::crossings(clv, path_2geom); + + for (std::vector::const_iterator k = _paths_to_snap_to->begin(); k != _paths_to_snap_to->end(); k++) { + if (k->path_vector) { + Geom::CrossingSet cs = Geom::crossings(clv, *(k->path_vector)); 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 path_2geom - for (std::vector::const_iterator m = cs[0].begin(); m != cs[0].end(); m++) { + // This first element contains a vector filled with crossings of cl with k->first + for (std::vector::const_iterator m = cs[0].begin(); m != cs[0].end(); m++) { if ((*m).ta >= 0 && (*m).ta <= 1 ) { // Reconstruct the point of intersection - NR::Point p_inters = p_min_on_cl + ((*m).ta) * (p_max_on_cl - p_min_on_cl); + 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) - NR::Coord dist = NR::L2(desktop->dt2doc(p_proj_on_cl) - p_inters); - SnappedPoint s(desktop->doc2dt(p_inters), SNAPTARGET_PATH, dist, getSnapperTolerance(), getSnapperAlwaysSnap()); - sc.points.push_back(s); - } - } + // (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), p.getSourceType(), p.getSourceNum(), k->target_type, dist, getSnapperTolerance(), getSnapperAlwaysSnap(), true, k->target_bbox); + sc.points.push_back(s); + } + } } } } @@ -561,120 +564,127 @@ void Inkscape::ObjectSnapper::_snapPathsConstrained(SnappedConstraints &sc, void Inkscape::ObjectSnapper::freeSnap(SnappedConstraints &sc, - Inkscape::Snapper::PointType const &t, - NR::Point const &p, - bool const &first_point, - NR::Maybe const &bbox_to_snap, + Inkscape::SnapCandidatePoint const &p, + Geom::OptRect const &bbox_to_snap, std::vector const *it, - std::vector *unselected_nodes) const + std::vector *unselected_nodes) const { - if (_snap_enabled == false || getSnapFrom(t) == false || _named_view == NULL) { + if (_snap_enabled == false || _snapmanager->snapprefs.getSnapFrom(p.getSourceType()) == false ) { return; } /* Get a list of all the SPItems that we will try to snap to */ - if (first_point) { - NR::Rect const local_bbox_to_snap = bbox_to_snap ? *bbox_to_snap : NR::Rect(p, p); - _findCandidates(sp_document_root(_named_view->document), it, first_point, local_bbox_to_snap, TRANSL_SNAP_XY); + if (p.getSourceNum() == 0) { + Geom::Rect const local_bbox_to_snap = bbox_to_snap ? *bbox_to_snap : Geom::Rect(p.getPoint(), p.getPoint()); + _findCandidates(sp_document_root(_snapmanager->getDocument()), it, p.getSourceNum() == 0, local_bbox_to_snap, TRANSL_SNAP_XY, false, Geom::identity()); } - - if (_snap_to_itemnode || _snap_to_bboxnode) { - _snapNodes(sc, t, p, first_point, unselected_nodes); + + if (_snapmanager->snapprefs.getSnapToItemNode() || _snapmanager->snapprefs.getSnapSmoothNodes() + || _snapmanager->snapprefs.getSnapToBBoxNode() || _snapmanager->snapprefs.getSnapToPageBorder() + || _snapmanager->snapprefs.getSnapLineMidpoints() || _snapmanager->snapprefs.getSnapObjectMidpoints() + || _snapmanager->snapprefs.getSnapBBoxEdgeMidpoints() || _snapmanager->snapprefs.getSnapBBoxMidpoints() + || _snapmanager->snapprefs.getIncludeItemCenter()) { + _snapNodes(sc, p, unselected_nodes); } - - // Consider the page's border for snapping to - NArtBpath const *border_bpath = _snap_to_page_border ? _getBorderBPath() : NULL; - - if (_snap_to_itempath || _snap_to_bboxpath || _snap_to_page_border) { + + if (_snapmanager->snapprefs.getSnapToItemPath() || _snapmanager->snapprefs.getSnapToBBoxPath() || _snapmanager->snapprefs.getSnapToPageBorder()) { unsigned n = (unselected_nodes == NULL) ? 0 : unselected_nodes->size(); if (n > 0) { - /* While editing a path in the node tool, findCandidates must ignore that path because + /* 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). * That path must not be ignored however when snapping to the paths, so we add it here * manually when applicable - */ + */ SPPath *path = NULL; if (it != NULL) { - g_assert(SP_IS_PATH(*it->begin())); - g_assert(it->size() == 1); - path = SP_PATH(*it->begin()); + if (it->size() == 1 && SP_IS_PATH(*it->begin())) { + path = SP_PATH(*it->begin()); + } // else: *it->begin() might be a SPGroup, e.g. when editing a LPE of text that has been converted to a group of paths + // as reported in bug #356743. In that case we can just ignore it, i.e. not snap to this item } - _snapPaths(sc, t, p, first_point, unselected_nodes, path, border_bpath); + _snapPaths(sc, p, unselected_nodes, path); } else { - _snapPaths(sc, t, p, first_point, NULL, NULL, border_bpath); - } + _snapPaths(sc, p, NULL, NULL); + } } } void Inkscape::ObjectSnapper::constrainedSnap( SnappedConstraints &sc, - Inkscape::Snapper::PointType const &t, - NR::Point const &p, - bool const &first_point, - NR::Maybe const &bbox_to_snap, + Inkscape::SnapCandidatePoint const &p, + Geom::OptRect const &bbox_to_snap, ConstraintLine const &c, std::vector const *it) const { - if (_snap_enabled == false || getSnapFrom(t) == false || _named_view == NULL) { + if (_snap_enabled == false || _snapmanager->snapprefs.getSnapFrom(p.getSourceType()) == false) { return; } /* Get a list of all the SPItems that we will try to snap to */ - if (first_point) { - NR::Rect const local_bbox_to_snap = bbox_to_snap ? *bbox_to_snap : NR::Rect(p, p); - _findCandidates(sp_document_root(_named_view->document), it, first_point, local_bbox_to_snap, TRANSL_SNAP_XY); + if (p.getSourceNum() == 0) { + Geom::Rect const local_bbox_to_snap = bbox_to_snap ? *bbox_to_snap : Geom::Rect(p.getPoint(), p.getPoint()); + _findCandidates(sp_document_root(_snapmanager->getDocument()), it, p.getSourceNum() == 0, 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 is usefull for example when scaling an object while maintaining a fixed aspect ratio. It's + // This is useful for example when scaling an object while maintaining a fixed aspect ratio. It's // nodes are only allowed to move in one direction (i.e. in one degree of freedom). - + // When snapping to objects, we either snap to their nodes or their paths. It is however very // unlikely that any node will be exactly at the constrained line, so for a constrained snap // to objects we will only consider the object's paths. Beside, the nodes will be at these paths, - // so we will more or less snap to them anyhow. + // so we will more or less snap to them anyhow. - if (_snap_to_itempath || _snap_to_bboxpath || _snap_to_page_border) { - _snapPathsConstrained(sc, t, p, first_point, c); + if (_snapmanager->snapprefs.getSnapToItemPath() || _snapmanager->snapprefs.getSnapToBBoxPath() || _snapmanager->snapprefs.getSnapToPageBorder()) { + _snapPathsConstrained(sc, p, c); } } // 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 +void Inkscape::ObjectSnapper::guideFreeSnap(SnappedConstraints &sc, + 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 cand; + std::vector const it; //just an empty list + + DimensionToSnap snap_dim; + if (guide_normal == to_2geom(component_vectors[Geom::Y])) { + snap_dim = GUIDE_TRANSL_SNAP_Y; + } else if (guide_normal == to_2geom(component_vectors[Geom::X])) { + snap_dim = GUIDE_TRANSL_SNAP_X; + } else { + snap_dim = ANGLED_GUIDE_TRANSL_SNAP; } - + + _findCandidates(sp_document_root(_snapmanager->getDocument()), &it, true, Geom::Rect(p, p), snap_dim, false, Geom::identity()); + _snapTranslatingGuideToNodes(sc, p, guide_normal); + +} + +// This method is used to snap the origin of a guide to nodes/paths, while dragging the origin along the guide +void Inkscape::ObjectSnapper::guideConstrainedSnap(SnappedConstraints &sc, + Geom::Point const &p, + Geom::Point const &guide_normal, + ConstraintLine const &/*c*/) const +{ /* Get a list of all the SPItems that we will try to snap to */ std::vector cand; std::vector const it; //just an empty list - + 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 - // only translating it. (For example when CTRL is pressed). We will need an UI part - // for that first; and some important usability choices need to be made: - // E.g. which point should be used for pivoting? A previously snapped point, - // 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, NR::Rect(p, p), snap_dim); - _snapTranslatingGuideToNodes(sc, Inkscape::Snapper::SNAPPOINT_GUIDE, p, guide_normal); - - // _snapRotatingGuideToNodes has not been implemented yet. + + _findCandidates(sp_document_root(_snapmanager->getDocument()), &it, true, Geom::Rect(p, p), snap_dim, false, Geom::identity()); + _snapTranslatingGuideToNodes(sc, p, guide_normal); + } /** @@ -682,40 +692,90 @@ void Inkscape::ObjectSnapper::guideSnap(SnappedConstraints &sc, */ 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); + bool snap_to_something = _snapmanager->snapprefs.getSnapToItemPath() + || _snapmanager->snapprefs.getSnapToItemNode() + || _snapmanager->snapprefs.getSnapToBBoxPath() + || _snapmanager->snapprefs.getSnapToBBoxNode() + || _snapmanager->snapprefs.getSnapToPageBorder() + || _snapmanager->snapprefs.getSnapLineMidpoints() || _snapmanager->snapprefs.getSnapObjectMidpoints() + || _snapmanager->snapprefs.getSnapBBoxEdgeMidpoints() || _snapmanager->snapprefs.getSnapBBoxMidpoints() + || _snapmanager->snapprefs.getIncludeItemCenter(); + + return (_snap_enabled && _snapmanager->snapprefs.getSnapModeBBoxOrNodes() && snap_to_something); } -bool Inkscape::ObjectSnapper::GuidesMightSnap() const +bool Inkscape::ObjectSnapper::GuidesMightSnap() const // almost the same as ThisSnapperMightSnap above, but only looking at points (and not paths) { - bool snap_to_something = _snap_to_itemnode || _snap_to_bboxnode; - return (_snap_enabled && (_snap_from & SNAPPOINT_GUIDE) && snap_to_something); + bool snap_to_something = _snapmanager->snapprefs.getSnapToItemNode() + || _snapmanager->snapprefs.getSnapToPageBorder() + || (_snapmanager->snapprefs.getSnapModeBBox() && _snapmanager->snapprefs.getSnapToBBoxNode()) + || (_snapmanager->snapprefs.getSnapModeBBox() && (_snapmanager->snapprefs.getSnapBBoxEdgeMidpoints() || _snapmanager->snapprefs.getSnapBBoxMidpoints())) + || (_snapmanager->snapprefs.getSnapModeNode() && (_snapmanager->snapprefs.getSnapLineMidpoints() || _snapmanager->snapprefs.getSnapObjectMidpoints())) + || (_snapmanager->snapprefs.getSnapModeNode() && _snapmanager->snapprefs.getIncludeItemCenter()) + || (_snapmanager->snapprefs.getSnapModeNode() && (_snapmanager->snapprefs.getSnapToItemPath() && _snapmanager->snapprefs.getSnapIntersectionCS())); + + return (_snap_enabled && _snapmanager->snapprefs.getSnapModeGuide() && snap_to_something); } -void Inkscape::ObjectSnapper::_clear_paths() const +void Inkscape::ObjectSnapper::_clear_paths() const { - for (std::vector::const_iterator k = _bpaths_to_snap_to->begin(); k != _bpaths_to_snap_to->end(); k++) { - g_free(*k); - } - _bpaths_to_snap_to->clear(); - - for (std::vector::const_iterator k = _paths_to_snap_to->begin(); k != _paths_to_snap_to->end(); k++) { - delete *k; + for (std::vector::const_iterator k = _paths_to_snap_to->begin(); k != _paths_to_snap_to->end(); k++) { + delete k->path_vector; } _paths_to_snap_to->clear(); } -NArtBpath const* Inkscape::ObjectSnapper::_getBorderBPath() const +Geom::PathVector* Inkscape::ObjectSnapper::_getBorderPathv() const { - NArtBpath const *border_bpath = NULL; - Geom::Rect const border_rect = Geom::Rect(Geom::Point(0,0), Geom::Point(sp_document_width(_named_view->document),sp_document_height(_named_view->document))); - SPCurve const *border_curve = SPCurve::new_from_rect(border_rect); + 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 +{ + SPCurve const *border_curve = SPCurve::new_from_rect(rect); if (border_curve) { - border_bpath = SP_CURVE_BPATH(border_curve); + Geom::PathVector *dummy = new Geom::PathVector(border_curve->get_pathvector()); + return dummy; + } else { + return NULL; + } +} + +void Inkscape::ObjectSnapper::_getBorderNodes(std::vector *points) const +{ + Geom::Coord w = sp_document_width(_snapmanager->getDocument()); + Geom::Coord h = sp_document_height(_snapmanager->getDocument()); + points->push_back(Inkscape::SnapCandidatePoint(Geom::Point(0,0), SNAPSOURCE_UNDEFINED, SNAPTARGET_PAGE_CORNER)); + points->push_back(Inkscape::SnapCandidatePoint(Geom::Point(0,h), SNAPSOURCE_UNDEFINED, SNAPTARGET_PAGE_CORNER)); + points->push_back(Inkscape::SnapCandidatePoint(Geom::Point(w,h), SNAPSOURCE_UNDEFINED, SNAPTARGET_PAGE_CORNER)); + points->push_back(Inkscape::SnapCandidatePoint(Geom::Point(w,0), SNAPSOURCE_UNDEFINED, SNAPTARGET_PAGE_CORNER)); +} + +void Inkscape::getBBoxPoints(Geom::OptRect const bbox, + std::vector *points, + bool const /*isTarget*/, + bool const includeCorners, + bool const includeLineMidpoints, + bool const includeObjectMidpoints) +{ + if (bbox) { + // collect the corners of the bounding box + for ( unsigned k = 0 ; k < 4 ; k++ ) { + if (includeCorners) { + points->push_back(Inkscape::SnapCandidatePoint(bbox->corner(k), Inkscape::SNAPSOURCE_BBOX_CORNER, 0, Inkscape::SNAPTARGET_BBOX_CORNER, *bbox)); + } + // optionally, collect the midpoints of the bounding box's edges too + if (includeLineMidpoints) { + points->push_back(Inkscape::SnapCandidatePoint((bbox->corner(k) + bbox->corner((k+1) % 4))/2, Inkscape::SNAPSOURCE_BBOX_EDGE_MIDPOINT, 0, Inkscape::SNAPTARGET_BBOX_EDGE_MIDPOINT, *bbox)); + } + } + if (includeObjectMidpoints) { + points->push_back(Inkscape::SnapCandidatePoint(bbox->midpoint(), Inkscape::SNAPSOURCE_BBOX_MIDPOINT, 0, Inkscape::SNAPTARGET_BBOX_MIDPOINT, *bbox)); + } } - - return border_bpath; } + /* Local Variables: mode:c++