X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fsnap.cpp;h=09cdbbaba9571933b5af33eea4d3a352e8bd64f0;hb=9e973c4fb2183b877bb600a7e9c75e93b3e7d6d1;hp=1ff5d3d059b5d5f69aa693955148a958c778ccfb;hpb=bbbe9eebaeb94bab65295acc609a7c98544c4f4c;p=inkscape.git diff --git a/src/snap.cpp b/src/snap.cpp index 1ff5d3d05..09cdbbaba 100644 --- a/src/snap.cpp +++ b/src/snap.cpp @@ -9,10 +9,11 @@ * Frank Felfe * Nathan Hurst * Carl Hetherington + * Diederik van Lierop * * Copyright (C) 2006-2007 Johan Engelen * Copyrigth (C) 2004 Nathan Hurst - * Copyright (C) 1999-2002 Authors + * Copyright (C) 1999-2008 Authors * * Released under GNU GPL, read the file 'COPYING' for more information */ @@ -28,6 +29,7 @@ #include #include "display/canvas-grid.h" +#include "display/snap-indicator.h" #include "inkscape.h" #include "desktop.h" @@ -44,9 +46,9 @@ SnapManager::SnapManager(SPNamedView const *v) : guide(v, 0), object(v, 0), _named_view(v), - _include_item_center(false) -{ - + _include_item_center(false), + _snap_enabled_globally(true) +{ } @@ -92,6 +94,10 @@ SnapManager::getGridSnappers() const bool SnapManager::SomeSnapperMightSnap() const { + if (!_snap_enabled_globally) { + return false; + } + SnapperList const s = getSnappers(); SnapperList::const_iterator i = s.begin(); while (i != s.end() && (*i)->ThisSnapperMightSnap() == false) { @@ -163,133 +169,149 @@ bool SnapManager::getSnapModeGuide() const } /** - * Try to snap a point to any interested snappers. + * Try to snap a point to any of the specified snappers. * - * \param t Type of point. + * \param point_type Type of point. * \param p Point. - * \param it Item to ignore when snapping. + * \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 snappers List of snappers to try to snap to * \return Snapped point. */ -Inkscape::SnappedPoint SnapManager::freeSnap(Inkscape::Snapper::PointType t, - NR::Point const &p, - SPItem const *it) const - +void SnapManager::freeSnapReturnByRef(Inkscape::Snapper::PointType point_type, + NR::Point &p, + bool first_point, + NR::Maybe const &bbox_to_snap) const { - std::list lit; - lit.push_back(it); - - std::vector points_to_snap; - points_to_snap.push_back(p); - - return freeSnap(t, p, true, points_to_snap, lit); + Inkscape::SnappedPoint const s = freeSnap(point_type, p, first_point, bbox_to_snap); + s.getPoint(p); } /** * Try to snap a point to any of the specified snappers. * - * \param t Type of point. + * \param point_type Type of point. * \param p Point. * \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 it List of items to ignore when snapping. - * \param snappers List of snappers to try to snap to + * \param snappers List of snappers to try to snap to * \return Snapped point. */ -Inkscape::SnappedPoint SnapManager::freeSnap(Inkscape::Snapper::PointType t, +Inkscape::SnappedPoint SnapManager::freeSnap(Inkscape::Snapper::PointType point_type, NR::Point const &p, - bool const &first_point, - std::vector &points_to_snap, - std::list const &it) const + bool first_point, + NR::Maybe const &bbox_to_snap) const { + if (!SomeSnapperMightSnap()) { + return Inkscape::SnappedPoint(p, Inkscape::SNAPTARGET_UNDEFINED, NR_HUGE, 0, false); + } - SnappedConstraints sc; + std::vector *items_to_ignore; + if (_item_to_ignore) { // If we have only a single item to ignore + // then build a list containing this single item; + // This single-item list will prevail over any other _items_to_ignore list, should that exist + items_to_ignore = new std::vector; + items_to_ignore->push_back(_item_to_ignore); + } else { + items_to_ignore = _items_to_ignore; + } + SnappedConstraints sc; SnapperList const snappers = getSnappers(); - + for (SnapperList::const_iterator i = snappers.begin(); i != snappers.end(); i++) { - (*i)->freeSnap(sc, t, p, first_point, points_to_snap, it); + (*i)->freeSnap(sc, point_type, p, first_point, bbox_to_snap, items_to_ignore, _unselected_nodes); } - - return findBestSnap(p, sc); + + if (_item_to_ignore) { + delete items_to_ignore; + } + + return findBestSnap(p, sc, false); } /** * Try to snap a point to any interested snappers. A snap will only occur along * a line described by a Inkscape::Snapper::ConstraintLine. * - * \param t Type of point. + * \param point_type Type of point. * \param p Point. - * \param c Constraint line. - * \param it Item to ignore when snapping. + * \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 constraint Constraint line. * \return Snapped point. */ -Inkscape::SnappedPoint SnapManager::constrainedSnap(Inkscape::Snapper::PointType t, - NR::Point const &p, - Inkscape::Snapper::ConstraintLine const &c, - SPItem const *it) const +void SnapManager::constrainedSnapReturnByRef(Inkscape::Snapper::PointType point_type, + NR::Point &p, + Inkscape::Snapper::ConstraintLine const &constraint, + bool first_point, + NR::Maybe const &bbox_to_snap) const { - std::list lit; - lit.push_back(it); - - std::vector points_to_snap; - points_to_snap.push_back(p); - - return constrainedSnap(t, p, true, points_to_snap, c, lit); + Inkscape::SnappedPoint const s = constrainedSnap(point_type, p, constraint, first_point, bbox_to_snap); + s.getPoint(p); } - - /** * Try to snap a point to any interested snappers. A snap will only occur along * a line described by a Inkscape::Snapper::ConstraintLine. * - * \param t Type of point. + * \param point_type Type of point. * \param p Point. * \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 c Constraint line. - * \param it List of items to ignore when snapping. + * \param constraint Constraint line. * \return Snapped point. */ -Inkscape::SnappedPoint SnapManager::constrainedSnap(Inkscape::Snapper::PointType t, +Inkscape::SnappedPoint SnapManager::constrainedSnap(Inkscape::Snapper::PointType point_type, NR::Point const &p, - bool const &first_point, - std::vector &points_to_snap, - Inkscape::Snapper::ConstraintLine const &c, - std::list const &it) const + Inkscape::Snapper::ConstraintLine const &constraint, + bool first_point, + NR::Maybe const &bbox_to_snap) const { + if (!SomeSnapperMightSnap()) { + return Inkscape::SnappedPoint(p, Inkscape::SNAPTARGET_UNDEFINED, NR_HUGE, 0, false); + } - SnappedConstraints sc; - + std::vector *items_to_ignore; + if (_item_to_ignore) { // If we have only a single item to ignore + // then build a list containing this single item; + // This single-item list will prevail over any other _items_to_ignore list, should that exist + items_to_ignore = new std::vector; + items_to_ignore->push_back(_item_to_ignore); + } else { + items_to_ignore = _items_to_ignore; + } + + SnappedConstraints sc; SnapperList const snappers = getSnappers(); for (SnapperList::const_iterator i = snappers.begin(); i != snappers.end(); i++) { - (*i)->constrainedSnap(sc, t, p, first_point, points_to_snap, c, it); + (*i)->constrainedSnap(sc, point_type, p, first_point, bbox_to_snap, constraint, items_to_ignore); } - - return findBestSnap(p, sc); + + if (_item_to_ignore) { + delete items_to_ignore; + } + + return findBestSnap(p, sc, true); } -Inkscape::SnappedPoint SnapManager::guideSnap(NR::Point const &p, - NR::Point const &guide_normal) const +void SnapManager::guideSnap(NR::Point &p, NR::Point const &guide_normal) const { - Inkscape::ObjectSnapper::DimensionToSnap snap_dim; - if (guide_normal == component_vectors[NR::Y]) { - snap_dim = Inkscape::ObjectSnapper::SNAP_Y; - } else if (guide_normal == component_vectors[NR::X]) { - snap_dim = Inkscape::ObjectSnapper::SNAP_X; - } else { - g_warning("WARNING: snapping of angled guides is not supported yet!"); - snap_dim = Inkscape::ObjectSnapper::SNAP_XY; + // This method is used to snap a guide to nodes, while dragging the guide around + + if (!(object.GuidesMightSnap() && _snap_enabled_globally)) { + return; } SnappedConstraints sc; - object.guideSnap(sc, p, snap_dim); + object.guideSnap(sc, p, guide_normal); - return findBestSnap(p, sc); + Inkscape::SnappedPoint const s = findBestSnap(p, sc, false); + s.getPoint(p); } @@ -300,20 +322,18 @@ Inkscape::SnappedPoint SnapManager::guideSnap(NR::Point const &p, * * \param type Type of points being snapped. * \param points List of points to snap. - * \param ignore List of items to ignore while snapping. * \param constrained true if the snap is constrained. * \param constraint Constraint line to use, if `constrained' is true, otherwise undefined. * \param transformation_type Type of transformation to apply to points before trying to snap them. * \param transformation Description of the transformation; details depend on the type. * \param origin Origin of the transformation, if applicable. * \param dim Dimension of the transformation, if applicable. - * \param uniform true if the transformation should be uniform, if applicable. + * \param uniform true if the transformation should be uniform; only applicable for stretching and scaling. */ -std::pair SnapManager::_snapTransformed( +Inkscape::SnappedPoint SnapManager::_snapTransformed( Inkscape::Snapper::PointType type, std::vector const &points, - std::list const &ignore, bool constrained, Inkscape::Snapper::ConstraintLine const &constraint, Transformation transformation_type, @@ -327,12 +347,16 @@ std::pair SnapManager::_snapTransformed( ** appropriate transformation with `true'; otherwise we return the original scale with `false'. */ - /* Quick check to see if we have any snappers that are enabled */ + /* Quick check to see if we have any snappers that are enabled + ** Also used to globally disable all snapping + */ if (SomeSnapperMightSnap() == false) { - return std::make_pair(transformation, false); + g_assert(points.size() > 0); + return Inkscape::SnappedPoint(); } std::vector transformed_points; + NR::Rect bbox; for (std::vector::const_iterator i = points.begin(); i != points.end(); i++) { @@ -343,7 +367,7 @@ std::pair SnapManager::_snapTransformed( transformed = *i + transformation; break; case SCALE: - transformed = ((*i - origin) * NR::scale(transformation[NR::X], transformation[NR::Y])) + origin; + transformed = (*i - origin) * NR::scale(transformation[NR::X], transformation[NR::Y]) + origin; break; case STRETCH: { @@ -358,14 +382,23 @@ std::pair SnapManager::_snapTransformed( break; } case SKEW: - transformed = *i; - transformed[dim] += transformation[dim] * ((*i)[1 - dim] - origin[1 - dim]); + // Apply the skew factor + transformed[dim] = (*i)[dim] + transformation[0] * ((*i)[1 - dim] - origin[1 - dim]); + // While skewing, mirroring and scaling (by integer multiples) in the opposite direction is also allowed. + // Apply that scale factor here + transformed[1-dim] = (*i - origin)[1 - dim] * transformation[1] + origin[1 - dim]; break; default: g_assert_not_reached(); } // add the current transformed point to the box hulling all transformed points + if (i == points.begin()) { + bbox = NR::Rect(transformed, transformed); + } else { + bbox.expandTo(transformed); + } + transformed_points.push_back(transformed); } @@ -377,29 +410,58 @@ std::pair SnapManager::_snapTransformed( */ NR::Coord best_metric = NR_HUGE; NR::Coord best_second_metric = NR_HUGE; - bool best_at_intersection = false; + NR::Point best_scale_metric(NR_HUGE, NR_HUGE); + Inkscape::SnappedPoint best_snapped_point; + g_assert(best_snapped_point.getAlwaysSnap() == false); // Check initialization of snapped point + g_assert(best_snapped_point.getAtIntersection() == false); std::vector::const_iterator j = transformed_points.begin(); - //std::cout << std::endl; - + // std::cout << std::endl; for (std::vector::const_iterator i = points.begin(); i != points.end(); i++) { - /* Snap it */ - Inkscape::SnappedPoint const snapped = constrained ? - constrainedSnap(type, *j, i == points.begin(), transformed_points, constraint, ignore) : freeSnap(type, *j, i == points.begin(), transformed_points, ignore); + /* Snap it */ + Inkscape::SnappedPoint snapped_point; + + if (constrained) { + Inkscape::Snapper::ConstraintLine dedicated_constraint = constraint; + if ((transformation_type == SCALE || transformation_type == STRETCH) && uniform) { + // When uniformly scaling, each point will have its own unique constraint line, + // running from the scaling origin to the original untransformed point. We will + // calculate that line here + dedicated_constraint = Inkscape::Snapper::ConstraintLine(origin, (*i) - origin); + } else if (transformation_type == STRETCH) { // when non-uniform stretching { + dedicated_constraint = Inkscape::Snapper::ConstraintLine((*i), component_vectors[dim]); + } else if (transformation_type == TRANSLATION) { + // When doing a constrained translation, all points will move in the same direction, i.e. + // either horizontally or vertically. The lines along which they move are therefore all + // parallel, but might not be colinear. Therefore we will have to set the point through + // which the constraint-line runs here, for each point individually. + dedicated_constraint.setPoint(*i); + } // else: leave the original constraint, e.g. for skewing + if (transformation_type == SCALE && !uniform) { + g_warning("Non-uniform constrained scaling is not supported!"); + } + snapped_point = constrainedSnap(type, *j, dedicated_constraint, i == points.begin(), bbox); + } else { + snapped_point = freeSnap(type, *j, i == points.begin(), bbox); + } NR::Point result; NR::Coord metric = NR_HUGE; NR::Coord second_metric = NR_HUGE; + NR::Point scale_metric(NR_HUGE, NR_HUGE); - if (snapped.getDistance() < NR_HUGE) { + if (snapped_point.getSnapped()) { /* We snapped. Find the transformation that describes where the snapped point has ** ended up, and also the metric for this transformation. */ + NR::Point const a = (snapped_point.getPoint() - origin); // vector to snapped point + NR::Point const b = (*i - origin); // vector to original point + switch (transformation_type) { case TRANSLATION: - result = snapped.getPoint() - *i; + result = snapped_point.getPoint() - *i; /* Consider the case in which a box is almost aligned with a grid in both * horizontal and vertical directions. The distance to the intersection of * the grid lines will always be larger then the distance to a single grid @@ -409,59 +471,116 @@ std::pair SnapManager::_snapTransformed( * distance is defined as the distance to the nearest line of the intersection, * and not to the intersection itself! */ - metric = snapped.getDistance(); //used to be: metric = NR::L2(result); - second_metric = snapped.getSecondDistance(); + metric = snapped_point.getDistance(); //used to be: metric = NR::L2(result); + second_metric = snapped_point.getSecondDistance(); break; case SCALE: { - NR::Point const a = (snapped.getPoint() - origin); - NR::Point const b = (*i - origin); - result = NR::Point(a[NR::X] / b[NR::X], a[NR::Y] / b[NR::Y]); - metric = std::abs(NR::L2(result) - NR::L2(transformation)); + result = NR::Point(NR_HUGE, NR_HUGE); + // If this point *i is horizontally or vertically aligned with + // the origin of the scaling, then it will scale purely in X or Y + // We can therefore only calculate the scaling in this direction + // and the scaling factor for the other direction should remain + // untouched (unless scaling is uniform ofcourse) + for (int index = 0; index < 2; index++) { + if (fabs(b[index]) > 1e-6) { // if SCALING CAN occur in this direction + if (fabs(fabs(a[index]/b[index]) - fabs(transformation[index])) > 1e-12) { // if SNAPPING DID occur in this direction + result[index] = a[index] / b[index]; // then calculate it! + } + // we might leave result[1-index] = NR_HUGE + // if scaling didn't occur in the other direction + } + } + // Compare the resulting scaling with the desired scaling + scale_metric = result - transformation; // One or both of its components might be NR_HUGE break; } case STRETCH: - { - for (int a = 0; a < 2; a++) { - if (uniform || a == dim) { - result[a] = (snapped.getPoint()[dim] - origin[dim]) / ((*i)[dim] - origin[dim]); - } else { - result[a] = 1; + result = NR::Point(NR_HUGE, NR_HUGE); + if (fabs(b[dim]) > 1e-6) { // if STRETCHING will occur for this point + result[dim] = a[dim] / b[dim]; + result[1-dim] = uniform ? result[dim] : 1; + } else { // STRETCHING might occur for this point, but only when the stretching is uniform + if (uniform && fabs(b[1-dim]) > 1e-6) { + result[1-dim] = a[1-dim] / b[1-dim]; + result[dim] = result[1-dim]; } } metric = std::abs(result[dim] - transformation[dim]); break; - } case SKEW: - result[dim] = (snapped.getPoint()[dim] - (*i)[dim]) / ((*i)[1 - dim] - origin[1 - dim]); - metric = std::abs(result[dim] - transformation[dim]); + result[0] = (snapped_point.getPoint()[dim] - (*i)[dim]) / ((*i)[1 - dim] - origin[1 - dim]); // skew factor + result[1] = transformation[1]; // scale factor + metric = std::abs(result[0] - transformation[0]); break; default: g_assert_not_reached(); } /* Note it if it's the best so far */ - bool const c1 = metric < best_metric; - bool const c2 = metric == best_metric && snapped.getAtIntersection() == true && best_at_intersection == false; - bool const c3a = metric == best_metric && snapped.getAtIntersection() == true && best_at_intersection == true; - bool const c3b = second_metric < best_second_metric; - - if (c1 || c2 || c3a && c3b) { - best_transformation = result; - best_metric = metric; - best_second_metric = second_metric; - best_at_intersection = snapped.getAtIntersection(); - //std::cout << "SEL "; - } //else { std::cout << " ";} + if (transformation_type == SCALE) { + for (int index = 0; index < 2; index++) { + if (fabs(scale_metric[index]) < fabs(best_scale_metric[index])) { + best_transformation[index] = result[index]; + best_scale_metric[index] = fabs(scale_metric[index]); + // When scaling, we're considering the best transformation in each direction separately + // Therefore two different snapped points might together make a single best transformation + // We will however return only a single snapped point (e.g. to display the snapping indicator) + best_snapped_point = snapped_point; + // std::cout << "SEL "; + } // else { std::cout << " ";} + } + if (uniform) { + if (best_scale_metric[0] < best_scale_metric[1]) { + best_transformation[1] = best_transformation[0]; + best_scale_metric[1] = best_scale_metric[0]; + } else { + best_transformation[0] = best_transformation[1]; + best_scale_metric[0] = best_scale_metric[1]; + } + } + best_metric = std::min(best_scale_metric[0], best_scale_metric[1]); + // std::cout << "P_orig = " << (*i) << " | scale_metric = " << scale_metric << " | distance = " << snapped_point.getDistance() << " | P_snap = " << snapped_point.getPoint() << std::endl; + } else { + bool const c1 = metric < best_metric; + bool const c2 = metric == best_metric && snapped_point.getAtIntersection() == true && best_snapped_point.getAtIntersection() == false; + bool const c3a = metric == best_metric && snapped_point.getAtIntersection() == true && best_snapped_point.getAtIntersection() == true; + bool const c3b = second_metric < best_second_metric; + bool const c4 = snapped_point.getAlwaysSnap() == true && best_snapped_point.getAlwaysSnap() == false; + bool const c4n = snapped_point.getAlwaysSnap() == false && best_snapped_point.getAlwaysSnap() == true; + + if ((c1 || c2 || (c3a && c3b) || c4) && !c4n) { + best_transformation = result; + best_metric = metric; + best_second_metric = second_metric; + best_snapped_point = snapped_point; + // std::cout << "SEL "; + } // else { std::cout << " ";} + // std::cout << "P_orig = " << (*i) << " | metric = " << metric << " | distance = " << snapped_point.getDistance() << " | second metric = " << second_metric << " | P_snap = " << snapped_point.getPoint() << std::endl; + } } - //std::cout << "P_orig = " << (*i) << " | metric = " << metric << " | distance = " << snapped.getDistance() << " | second metric = " << second_metric << " | P_snap = " << snapped.getPoint() << std::endl; j++; } + if (transformation_type == SCALE) { + // When scaling, don't ever exit with one of scaling components set to NR_HUGE + for (int index = 0; index < 2; index++) { + if (best_transformation[index] == NR_HUGE) { + if (uniform && best_transformation[1-index] < NR_HUGE) { + best_transformation[index] = best_transformation[1-index]; + } else { + best_transformation[index] = transformation[index]; + } + } + } + } + + best_snapped_point.setTransformation(best_transformation); // Using " < 1e6" instead of " < NR_HUGE" for catching some rounding errors - // These rounding errors might be caused by NRRects, see bug #1584301 - return std::make_pair(best_transformation, best_metric < 1e6); + // These rounding errors might be caused by NRRects, see bug #1584301 + best_snapped_point.setDistance(best_metric < 1e6 ? best_metric : NR_HUGE); + return best_snapped_point; } @@ -469,21 +588,17 @@ std::pair SnapManager::_snapTransformed( * Try to snap a list of points to any interested snappers after they have undergone * a translation. * - * \param t Type of points. + * \param point_type Type of points. * \param p Points. - * \param it List of items to ignore when snapping. * \param tr Proposed translation. * \return Snapped translation, if a snap occurred, and a flag indicating whether a snap occurred. */ -std::pair SnapManager::freeSnapTranslation(Inkscape::Snapper::PointType t, - std::vector const &p, - std::list const &it, - NR::Point const &tr) const +Inkscape::SnappedPoint SnapManager::freeSnapTranslation(Inkscape::Snapper::PointType point_type, + std::vector const &p, + NR::Point const &tr) const { - return _snapTransformed( - t, p, it, false, NR::Point(), TRANSLATION, tr, NR::Point(), NR::X, false - ); + return _snapTransformed(point_type, p, false, NR::Point(), TRANSLATION, tr, NR::Point(), NR::X, false); } @@ -492,23 +607,19 @@ std::pair SnapManager::freeSnapTranslation(Inkscape::Snapper::P * translation. A snap will only occur along a line described by a * Inkscape::Snapper::ConstraintLine. * - * \param t Type of points. + * \param point_type Type of points. * \param p Points. - * \param it List of items to ignore when snapping. - * \param c Constraint line. + * \param constraint Constraint line. * \param tr Proposed translation. * \return Snapped translation, if a snap occurred, and a flag indicating whether a snap occurred. */ -std::pair SnapManager::constrainedSnapTranslation(Inkscape::Snapper::PointType t, - std::vector const &p, - std::list const &it, - Inkscape::Snapper::ConstraintLine const &c, - NR::Point const &tr) const +Inkscape::SnappedPoint SnapManager::constrainedSnapTranslation(Inkscape::Snapper::PointType point_type, + std::vector const &p, + Inkscape::Snapper::ConstraintLine const &constraint, + NR::Point const &tr) const { - return _snapTransformed( - t, p, it, true, c, TRANSLATION, tr, NR::Point(), NR::X, false - ); + return _snapTransformed(point_type, p, true, constraint, TRANSLATION, tr, NR::Point(), NR::X, false); } @@ -516,23 +627,19 @@ std::pair SnapManager::constrainedSnapTranslation(Inkscape::Sna * Try to snap a list of points to any interested snappers after they have undergone * a scale. * - * \param t Type of points. + * \param point_type Type of points. * \param p Points. - * \param it List of items to ignore when snapping. * \param s Proposed scale. * \param o Origin of proposed scale. * \return Snapped scale, if a snap occurred, and a flag indicating whether a snap occurred. */ -std::pair SnapManager::freeSnapScale(Inkscape::Snapper::PointType t, - std::vector const &p, - std::list const &it, - NR::scale const &s, - NR::Point const &o) const +Inkscape::SnappedPoint SnapManager::freeSnapScale(Inkscape::Snapper::PointType point_type, + std::vector const &p, + NR::scale const &s, + NR::Point const &o) const { - return _snapTransformed( - t, p, it, false, NR::Point(), SCALE, NR::Point(s[NR::X], s[NR::Y]), o, NR::X, false - ); + return _snapTransformed(point_type, p, false, NR::Point(), SCALE, NR::Point(s[NR::X], s[NR::Y]), o, NR::X, false); } @@ -541,24 +648,20 @@ std::pair SnapManager::freeSnapScale(Inkscape::Snapper::PointTy * a scale. A snap will only occur along a line described by a * Inkscape::Snapper::ConstraintLine. * - * \param t Type of points. + * \param point_type Type of points. * \param p Points. - * \param it List of items to ignore when snapping. * \param s Proposed scale. * \param o Origin of proposed scale. * \return Snapped scale, if a snap occurred, and a flag indicating whether a snap occurred. */ -std::pair SnapManager::constrainedSnapScale(Inkscape::Snapper::PointType t, - std::vector const &p, - std::list const &it, - Inkscape::Snapper::ConstraintLine const &c, - NR::scale const &s, - NR::Point const &o) const +Inkscape::SnappedPoint SnapManager::constrainedSnapScale(Inkscape::Snapper::PointType point_type, + std::vector const &p, + NR::scale const &s, + NR::Point const &o) const { - return _snapTransformed( - t, p, it, true, c, SCALE, NR::Point(s[NR::X], s[NR::Y]), o, NR::X, false - ); + // When constrained scaling, only uniform scaling is supported. + return _snapTransformed(point_type, p, true, NR::Point(), SCALE, NR::Point(s[NR::X], s[NR::Y]), o, NR::X, true); } @@ -566,9 +669,8 @@ std::pair SnapManager::constrainedSnapScale(Inkscape::Snapper:: * Try to snap a list of points to any interested snappers after they have undergone * a stretch. * - * \param t Type of points. + * \param point_type Type of points. * \param p Points. - * \param it List of items to ignore when snapping. * \param s Proposed stretch. * \param o Origin of proposed stretch. * \param d Dimension in which to apply proposed stretch. @@ -576,19 +678,14 @@ std::pair SnapManager::constrainedSnapScale(Inkscape::Snapper:: * \return Snapped stretch, if a snap occurred, and a flag indicating whether a snap occurred. */ -std::pair SnapManager::freeSnapStretch(Inkscape::Snapper::PointType t, - std::vector const &p, - std::list const &it, - NR::Coord const &s, - NR::Point const &o, - NR::Dim2 d, - bool u) const +Inkscape::SnappedPoint SnapManager::constrainedSnapStretch(Inkscape::Snapper::PointType point_type, + std::vector const &p, + NR::Coord const &s, + NR::Point const &o, + NR::Dim2 d, + bool u) const { - std::pair const r = _snapTransformed( - t, p, it, false, NR::Point(), STRETCH, NR::Point(s, s), o, d, u - ); - - return std::make_pair(r.first[d], r.second); + return _snapTransformed(point_type, p, true, NR::Point(), STRETCH, NR::Point(s, s), o, d, u); } @@ -596,121 +693,155 @@ std::pair SnapManager::freeSnapStretch(Inkscape::Snapper::Point * Try to snap a list of points to any interested snappers after they have undergone * a skew. * - * \param t Type of points. + * \param point_type Type of points. * \param p Points. - * \param it List of items to ignore when snapping. * \param s Proposed skew. * \param o Origin of proposed skew. * \param d Dimension in which to apply proposed skew. * \return Snapped skew, if a snap occurred, and a flag indicating whether a snap occurred. */ -std::pair SnapManager::freeSnapSkew(Inkscape::Snapper::PointType t, - std::vector const &p, - std::list const &it, - NR::Coord const &s, - NR::Point const &o, - NR::Dim2 d) const +Inkscape::SnappedPoint SnapManager::constrainedSnapSkew(Inkscape::Snapper::PointType point_type, + std::vector const &p, + Inkscape::Snapper::ConstraintLine const &constraint, + NR::Point const &s, + NR::Point const &o, + NR::Dim2 d) const { - std::pair const r = _snapTransformed( - t, p, it, false, NR::Point(), SKEW, NR::Point(s, s), o, d, false - ); - - return std::make_pair(r.first[d], r.second); + // "s" contains skew factor in s[0], and scale factor in s[1] + return _snapTransformed(point_type, p, true, constraint, SKEW, s, o, d, false); } -Inkscape::SnappedPoint SnapManager::findBestSnap(NR::Point const &p, SnappedConstraints &sc) const +Inkscape::SnappedPoint SnapManager::findBestSnap(NR::Point const &p, SnappedConstraints &sc, bool constrained) const { - NR::Coord const guide_sens = guide.getDistance(); - NR::Coord grid_sens = 0; - - SnapManager::SnapperList const gs = getGridSnappers(); - SnapperList::const_iterator i = gs.begin(); - if (i != gs.end()) { - grid_sens = (*i)->getDistance(); - } - - // Store all snappoints, optionally together with their specific snapping range - std::list > sp_list; - // Most of these snapped points are already within the snapping range, because - // they have already been filtered by their respective snappers. In that case - // we can set the snapping range to NR_HUGE here. If however we're looking at - // intersections of e.g. a grid and guide line, then we'll have to determine - // once again whether we're within snapping range. In this case we will set - // the snapping range to e.g. min(guide_sens, grid_sens) + /* + std::cout << "Type and number of snapped constraints: " << std::endl; + std::cout << " Points : " << sc.points.size() << std::endl; + std::cout << " Lines : " << sc.lines.size() << std::endl; + std::cout << " Grid lines : " << sc.grid_lines.size()<< std::endl; + std::cout << " Guide lines : " << sc.guide_lines.size()<< std::endl; + */ + + // Store all snappoints + std::list sp_list; // search for the closest snapped point Inkscape::SnappedPoint closestPoint; if (getClosestSP(sc.points, closestPoint)) { - sp_list.push_back(std::make_pair(closestPoint, NR_HUGE)); + sp_list.push_back(closestPoint); } // search for the closest snapped line segment Inkscape::SnappedLineSegment closestLineSegment; if (getClosestSLS(sc.lines, closestLineSegment)) { - sp_list.push_back(std::make_pair(Inkscape::SnappedPoint(closestLineSegment), NR_HUGE)); + sp_list.push_back(Inkscape::SnappedPoint(closestLineSegment)); } if (_intersectionLS) { // search for the closest snapped intersection of line segments Inkscape::SnappedPoint closestLineSegmentIntersection; if (getClosestIntersectionSLS(sc.lines, closestLineSegmentIntersection)) { - sp_list.push_back(std::make_pair(closestLineSegmentIntersection, NR_HUGE)); + sp_list.push_back(closestLineSegmentIntersection); } } // search for the closest snapped grid line Inkscape::SnappedLine closestGridLine; if (getClosestSL(sc.grid_lines, closestGridLine)) { - sp_list.push_back(std::make_pair(Inkscape::SnappedPoint(closestGridLine), NR_HUGE)); + closestGridLine.setTarget(Inkscape::SNAPTARGET_GRID); + sp_list.push_back(Inkscape::SnappedPoint(closestGridLine)); } // search for the closest snapped guide line Inkscape::SnappedLine closestGuideLine; if (getClosestSL(sc.guide_lines, closestGuideLine)) { - sp_list.push_back(std::make_pair(Inkscape::SnappedPoint(closestGuideLine), NR_HUGE)); + closestGuideLine.setTarget(Inkscape::SNAPTARGET_GUIDE); + sp_list.push_back(Inkscape::SnappedPoint(closestGuideLine)); } - // search for the closest snapped intersection of grid lines - Inkscape::SnappedPoint closestGridPoint; - if (getClosestIntersectionSL(sc.grid_lines, closestGridPoint)) { - sp_list.push_back(std::make_pair(closestGridPoint, NR_HUGE)); - } - - // search for the closest snapped intersection of guide lines - Inkscape::SnappedPoint closestGuidePoint; - if (getClosestIntersectionSL(sc.guide_lines, closestGuidePoint)) { - sp_list.push_back(std::make_pair(closestGuidePoint, NR_HUGE)); - } + // When freely snapping to a grid/guide/path, only one degree of freedom is eliminated + // Therefore we will try get fully constrained by finding an intersection with another grid/guide/path - // search for the closest snapped intersection of grid with guide lines - if (_intersectionGG) { - Inkscape::SnappedPoint closestGridGuidePoint; - if (getClosestIntersectionSL(sc.grid_lines, sc.guide_lines, closestGridGuidePoint)) { - sp_list.push_back(std::make_pair(closestGridGuidePoint, std::min(guide_sens, grid_sens))); - } + // When doing a constrained snap however, we're already at an intersection of the constrained line and + // the grid/guide/path we're snapping to. This snappoint is therefore fully constrained, so there's + // no need to look for additional intersections + if (!constrained) { + // search for the closest snapped intersection of grid lines + Inkscape::SnappedPoint closestGridPoint; + if (getClosestIntersectionSL(sc.grid_lines, closestGridPoint)) { + closestGridPoint.setTarget(Inkscape::SNAPTARGET_GRID_INTERSECTION); + sp_list.push_back(closestGridPoint); + } + + // search for the closest snapped intersection of guide lines + Inkscape::SnappedPoint closestGuidePoint; + if (getClosestIntersectionSL(sc.guide_lines, closestGuidePoint)) { + closestGuidePoint.setTarget(Inkscape::SNAPTARGET_GUIDE_INTERSECTION); + sp_list.push_back(closestGuidePoint); + } + + // search for the closest snapped intersection of grid with guide lines + if (_intersectionGG) { + Inkscape::SnappedPoint closestGridGuidePoint; + if (getClosestIntersectionSL(sc.grid_lines, sc.guide_lines, closestGridGuidePoint)) { + closestGridGuidePoint.setTarget(Inkscape::SNAPTARGET_GRID_GUIDE_INTERSECTION); + sp_list.push_back(closestGridGuidePoint); + } + } } // now let's see which snapped point gets a thumbs up - Inkscape::SnappedPoint bestPoint(p, NR_HUGE); - for (std::list >::const_iterator i = sp_list.begin(); i != sp_list.end(); i++) { + Inkscape::SnappedPoint bestSnappedPoint = Inkscape::SnappedPoint(p, Inkscape::SNAPTARGET_UNDEFINED, NR_HUGE, 0, false); + for (std::list::const_iterator i = sp_list.begin(); i != sp_list.end(); i++) { // first find out if this snapped point is within snapping range - if ((*i).first.getDistance() <= (*i).second) { + if ((*i).getDistance() <= (*i).getTolerance()) { // if it's the first point bool c1 = (i == sp_list.begin()); // or, if it's closer - bool c2 = (*i).first.getDistance() < bestPoint.getDistance(); - // or, if it's just as close then consider the second distance + bool c2 = (*i).getDistance() < bestSnappedPoint.getDistance(); + // or, if it's for a snapper with "always snap" turned on, and the previous wasn't + bool c3 = (*i).getAlwaysSnap() && !bestSnappedPoint.getAlwaysSnap(); + // But in no case fall back from a snapper with "always snap" on to one with "always snap" off + bool c3n = !(*i).getAlwaysSnap() && bestSnappedPoint.getAlwaysSnap(); + // or, if it's just as close then consider the second distance // (which is only relevant for points at an intersection) - bool c3a = ((*i).first.getDistance() == bestPoint.getDistance()); - bool c3b = (*i).first.getSecondDistance() < bestPoint.getSecondDistance(); + bool c4a = ((*i).getDistance() == bestSnappedPoint.getDistance()); + bool c4b = (*i).getSecondDistance() < bestSnappedPoint.getSecondDistance(); // then prefer this point over the previous one - if (c1 || c2 || c3a && c3b) { - bestPoint = (*i).first; + if ((c1 || c2 || c3 || (c4a && c4b)) && !c3n) { + bestSnappedPoint = *i; } } } - return bestPoint; + + + // Update the snap indicator, if requested + if (_desktop_for_snapindicator) { + if (bestSnappedPoint.getSnapped()) { + _desktop_for_snapindicator->snapindicator->set_new_snappoint(bestSnappedPoint); + } else { + _desktop_for_snapindicator->snapindicator->remove_snappoint(); + } + } + + // std::cout << "findBestSnap = " << bestSnappedPoint.getPoint() << std::endl; + return bestSnappedPoint; +} + +void SnapManager::setup(SPDesktop const *desktop_for_snapindicator, SPItem const *item_to_ignore, std::vector *unselected_nodes) +{ + _item_to_ignore = item_to_ignore; + _items_to_ignore = NULL; + _desktop_for_snapindicator = desktop_for_snapindicator; + _unselected_nodes = unselected_nodes; +} + +void SnapManager::setup(SPDesktop const *desktop_for_snapindicator, std::vector &items_to_ignore, std::vector *unselected_nodes) +{ + _item_to_ignore = NULL; + _items_to_ignore = &items_to_ignore; + _desktop_for_snapindicator = desktop_for_snapindicator; + _unselected_nodes = unselected_nodes; } /*