X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fsnapper.cpp;h=492e4ca4d019b4da14ac7a72094b470f78fa4504;hb=ea479a317d3fb2890308a1cc99ee730dd7b76de8;hp=5d39c6b02aeecd984b635b1bf6b677a2a44e09fd;hpb=5d34a7de8fd25b5ff22b5ca5ae2a631611a18f6f;p=inkscape.git diff --git a/src/snapper.cpp b/src/snapper.cpp index 5d39c6b02..492e4ca4d 100644 --- a/src/snapper.cpp +++ b/src/snapper.cpp @@ -4,6 +4,7 @@ * * Authors: * Carl Hetherington + * Diederik van Lierop * * Released under GNU GPL, read the file 'COPYING' for more information. */ @@ -13,61 +14,41 @@ #include "inkscape.h" #include "desktop.h" -Inkscape::Snapper::PointType const Inkscape::Snapper::SNAPPOINT_BBOX = 0x1; -Inkscape::Snapper::PointType const Inkscape::Snapper::SNAPPOINT_NODE = 0x2; -Inkscape::Snapper::PointType const Inkscape::Snapper::SNAPPOINT_GUIDE = 0x4; - /** * Construct new Snapper for named view. * \param nv Named view. - * \param d Snap distance. - */ -Inkscape::Snapper::Snapper(SPNamedView const *nv, NR::Coord const d) : _named_view(nv), _enabled(true), _distance(d) -{ - g_assert(_named_view != NULL); - g_assert(SP_IS_NAMEDVIEW(_named_view)); - - setSnapFrom(SNAPPOINT_BBOX | SNAPPOINT_NODE, true); //Snap any point. In v0.45 and earlier, this was controlled in the preferences tab -} - -/** - * Set snap distance. - * \param d New snap distance (desktop coordinates) + * \param d Snap tolerance. */ -void Inkscape::Snapper::setDistance(NR::Coord const d) +Inkscape::Snapper::Snapper(SnapManager *sm, Geom::Coord const t) : + _snapmanager(sm), + _snap_enabled(true), + _snapper_tolerance(std::max(t, 1.0)) { - _distance = d; + g_assert(_snapmanager != NULL); } /** - * \return Snap distance (desktop coordinates); depends on current zoom so that it's always the same in screen pixels + * Set snap tolerance. + * \param d New snap tolerance (desktop coordinates) */ -NR::Coord Inkscape::Snapper::getDistance() const +void Inkscape::Snapper::setSnapperTolerance(Geom::Coord const d) { - return _distance / SP_ACTIVE_DESKTOP->current_zoom(); + _snapper_tolerance = std::max(d, 1.0); } /** - * Turn on/off snapping of specific point types. - * \param t Point type. - * \param s true to snap to this point type, otherwise false; + * \return Snap tolerance (desktop coordinates); depends on current zoom so that it's always the same in screen pixels */ -void Inkscape::Snapper::setSnapFrom(PointType t, bool s) +Geom::Coord Inkscape::Snapper::getSnapperTolerance() const { - if (s) { - _snap_from |= t; - } else { - _snap_from &= ~t; - } + SPDesktop const *dt = _snapmanager->getDesktop(); + double const zoom = dt ? dt->current_zoom() : 1; + return _snapper_tolerance / zoom; } -/** - * \param t Point type. - * \return true if snapper will snap this type of point, otherwise false. - */ -bool Inkscape::Snapper::getSnapFrom(PointType t) const +bool Inkscape::Snapper::getSnapperAlwaysSnap() const { - return (_snap_from & t); + return _snapper_tolerance == 10000; //TODO: Replace this threshold of 10000 by a constant; see also tolerance-slider.cpp } /** @@ -76,99 +57,7 @@ bool Inkscape::Snapper::getSnapFrom(PointType t) const void Inkscape::Snapper::setEnabled(bool s) { - _enabled = s; -} - - -/** - * Try to snap a point to whatever this snapper is interested in. Any - * snap that occurs will be to the nearest "interesting" thing (e.g. a - * grid or guide line) - * - * \param t Point type. - * \param p Point to snap (desktop coordinates). - * \param it Item that should not be snapped to. - * \return Snapped point. - */ - -Inkscape::SnappedPoint Inkscape::Snapper::freeSnap(PointType const &t, - NR::Point const &p, - SPItem const *it) const -{ - std::list lit; - lit.push_back(it); - return freeSnap(t, p, lit); -} - - -/** - * Try to snap a point to whatever this snapper is interested in. Any - * snap that occurs will be to the nearest "interesting" thing (e.g. a - * grid or guide line) - * - * \param t Point type. - * \param p Point to snap (desktop coordinates). - * \param it Items that should not be snapped to. - * \return Snapped point. - */ - -Inkscape::SnappedPoint Inkscape::Snapper::freeSnap(PointType const &t, - NR::Point const &p, - std::list const &it) const -{ - if (_enabled == false || getSnapFrom(t) == false) { - return SnappedPoint(p, NR_HUGE); - } - - return _doFreeSnap(t, p, it); -} - - - - -/** - * Try to snap a point to whatever this snapper is interested in, where - * the snap point is constrained to lie along a specified vector from the - * original point. - * - * \param p Point to snap (desktop coordinates). - * \param c Vector to constrain the snap to. - * \param it Items that should not be snapped to. - * \return Snapped point. - */ - -Inkscape::SnappedPoint Inkscape::Snapper::constrainedSnap(PointType const &t, - NR::Point const &p, - ConstraintLine const &c, - SPItem const *it) const -{ - std::list lit; - lit.push_back(it); - return constrainedSnap(t, p, c, lit); -} - - -/** - * Try to snap a point to whatever this snapper is interested in, where - * the snap point is constrained to lie along a specified vector from the - * original point. - * - * \param p Point to snap (desktop coordinates). - * \param c Vector to constrain the snap to. - * \param it Items that should not be snapped to. - * \return Snapped point. - */ - -Inkscape::SnappedPoint Inkscape::Snapper::constrainedSnap(PointType const &t, - NR::Point const &p, - ConstraintLine const &c, - std::list const &it) const -{ - if (_enabled == false || getSnapFrom(t) == false) { - return SnappedPoint(p, NR_HUGE); - } - - return _doConstrainedSnap(t, p, c, it); + _snap_enabled = s; } /*