X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fsnap.cpp;h=09cdbbaba9571933b5af33eea4d3a352e8bd64f0;hb=9e973c4fb2183b877bb600a7e9c75e93b3e7d6d1;hp=3bee26f730377cd215b5b4eeb6c06cda80824a0f;hpb=de19d0a8c684298be714d18c991965b370707ed8;p=inkscape.git diff --git a/src/snap.cpp b/src/snap.cpp index 3bee26f73..09cdbbaba 100644 --- a/src/snap.cpp +++ b/src/snap.cpp @@ -13,7 +13,7 @@ * * 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 */ @@ -29,6 +29,7 @@ #include #include "display/canvas-grid.h" +#include "display/snap-indicator.h" #include "inkscape.h" #include "desktop.h" @@ -168,58 +169,66 @@ 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, NR_HUGE, 0, false); + 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); } - + + if (_item_to_ignore) { + delete items_to_ignore; + } + return findBestSnap(p, sc, false); } @@ -227,76 +236,82 @@ Inkscape::SnappedPoint SnapManager::freeSnap(Inkscape::Snapper::PointType t, * 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, NR_HUGE, 0, false); + 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); } - + + 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 { // This method is used to snap a guide to nodes, while dragging the guide around if (!(object.GuidesMightSnap() && _snap_enabled_globally)) { - return Inkscape::SnappedPoint(p, NR_HUGE, 0, false); + return; } SnappedConstraints sc; object.guideSnap(sc, p, guide_normal); - return findBestSnap(p, sc, false); + Inkscape::SnappedPoint const s = findBestSnap(p, sc, false); + s.getPoint(p); } @@ -307,7 +322,6 @@ 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. @@ -317,10 +331,9 @@ Inkscape::SnappedPoint SnapManager::guideSnap(NR::Point const &p, * \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, @@ -338,10 +351,12 @@ std::pair SnapManager::_snapTransformed( ** 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++) { @@ -352,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: { @@ -367,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); } @@ -387,32 +411,40 @@ std::pair SnapManager::_snapTransformed( NR::Coord best_metric = NR_HUGE; NR::Coord best_second_metric = NR_HUGE; NR::Point best_scale_metric(NR_HUGE, NR_HUGE); - bool best_at_intersection = false; - bool best_always_snap = false; + 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 snapped; + Inkscape::SnappedPoint snapped_point; if (constrained) { Inkscape::Snapper::ConstraintLine dedicated_constraint = constraint; - if (transformation_type == SCALE && uniform) { + 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: leave the original constraint, e.g. for constrained translation + } 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 = constrainedSnap(type, *j, i == points.begin(), transformed_points, dedicated_constraint, ignore); + snapped_point = constrainedSnap(type, *j, dedicated_constraint, i == points.begin(), bbox); } else { - snapped = freeSnap(type, *j, i == points.begin(), transformed_points, ignore); + snapped_point = freeSnap(type, *j, i == points.begin(), bbox); } NR::Point result; @@ -420,13 +452,16 @@ std::pair SnapManager::_snapTransformed( 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 @@ -436,13 +471,11 @@ 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); // vector to snapped point - NR::Point const b = (*i - origin); // vector to original point 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 @@ -458,24 +491,27 @@ std::pair SnapManager::_snapTransformed( // 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 index = 0; index < 2; index++) { - if (uniform || index == dim) { - result[index] = (snapped.getPoint()[dim] - origin[dim]) / ((*i)[dim] - origin[dim]); - } else { - result[index] = 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(); @@ -487,8 +523,12 @@ std::pair SnapManager::_snapTransformed( if (fabs(scale_metric[index]) < fabs(best_scale_metric[index])) { best_transformation[index] = result[index]; best_scale_metric[index] = fabs(scale_metric[index]); - //std::cout << "SEL "; - } //else { std::cout << " ";} + // 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]) { @@ -500,48 +540,47 @@ std::pair SnapManager::_snapTransformed( } } best_metric = std::min(best_scale_metric[0], best_scale_metric[1]); - //std::cout << "P_orig = " << (*i) << " | scale_metric = " << scale_metric << " | distance = " << snapped.getDistance() << " | P_snap = " << snapped.getPoint() << std::endl; + // 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.getAtIntersection() == true && best_at_intersection == false; - bool const c3a = metric == best_metric && snapped.getAtIntersection() == true && best_at_intersection == true; + 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.getAlwaysSnap() == true && best_always_snap == false; - bool const c4n = snapped.getAlwaysSnap() == false && best_always_snap == true; + 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_at_intersection = snapped.getAtIntersection(); - best_always_snap = snapped.getAlwaysSnap(); - //std::cout << "SEL "; - } //else { std::cout << " ";} - //std::cout << "P_orig = " << (*i) << " | metric = " << metric << " | distance = " << snapped.getDistance() << " | second metric = " << second_metric << " | P_snap = " << snapped.getPoint() << std::endl; + 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; } } - j++; } if (transformation_type == SCALE) { // When scaling, don't ever exit with one of scaling components set to NR_HUGE - if (best_transformation == NR::Point(NR_HUGE, NR_HUGE)) { - best_transformation == transformation; // return the original (i.e. un-snapped) transformation - } else { - // Still one of the transformation components could be NR_HUGE - for (int index = 0; index < 2; index++) { - if (best_transformation[index] == NR_HUGE) { - best_transformation[index] == uniform ? best_transformation[1-index] : transformation[index]; + 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; } @@ -549,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); } @@ -572,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); } @@ -596,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); } @@ -621,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, - 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 { // When constrained scaling, only uniform scaling is supported. - return _snapTransformed( - t, p, it, true, NR::Point(), SCALE, NR::Point(s[NR::X], s[NR::Y]), o, NR::X, true - ); + return _snapTransformed(point_type, p, true, NR::Point(), SCALE, NR::Point(s[NR::X], s[NR::Y]), o, NR::X, true); } @@ -646,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. @@ -656,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); } @@ -676,48 +693,37 @@ 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, bool constrained) const { - NR::Coord const guide_tol = guide.getSnapperTolerance(); - NR::Coord grid_tol = 0; - - SnapManager::SnapperList const gs = getGridSnappers(); - SnapperList::const_iterator i = gs.begin(); - if (i != gs.end()) { - grid_tol = (*i)->getSnapperTolerance(); // there's only a single tolerance, equal for all grids - } - + /* + 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; - // 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_tol) // search for the closest snapped point Inkscape::SnappedPoint closestPoint; @@ -742,12 +748,14 @@ Inkscape::SnappedPoint SnapManager::findBestSnap(NR::Point const &p, SnappedCons // search for the closest snapped grid line Inkscape::SnappedLine closestGridLine; if (getClosestSL(sc.grid_lines, closestGridLine)) { + 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)) { + closestGuideLine.setTarget(Inkscape::SNAPTARGET_GUIDE); sp_list.push_back(Inkscape::SnappedPoint(closestGuideLine)); } @@ -761,12 +769,14 @@ Inkscape::SnappedPoint SnapManager::findBestSnap(NR::Point const &p, SnappedCons // 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); } @@ -774,13 +784,14 @@ Inkscape::SnappedPoint SnapManager::findBestSnap(NR::Point const &p, SnappedCons if (_intersectionGG) { Inkscape::SnappedPoint closestGridGuidePoint; if (getClosestIntersectionSL(sc.grid_lines, sc.guide_lines, closestGridGuidePoint)) { - sp_list.push_back(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 bestSnappedPoint = Inkscape::SnappedPoint(p, NR_HUGE, 0, false); + 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).getDistance() <= (*i).getTolerance()) { @@ -803,9 +814,36 @@ Inkscape::SnappedPoint SnapManager::findBestSnap(NR::Point const &p, SnappedCons } } + + // 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; +} + /* Local Variables: mode:c++