X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fsnapper.cpp;h=7e45681602f293e19f8774a5b234f8913014ece1;hb=e9b6af083e34e2397a8ddbe9781920733d09d151;hp=27531b50b9f371b37c0772da44261a84622a69c6;hpb=6b15695578f07a3f72c4c9475c1a261a3021472a;p=inkscape.git

diff --git a/src/snapper.cpp b/src/snapper.cpp
index 27531b50b..7e4568160 100644
--- a/src/snapper.cpp
+++ b/src/snapper.cpp
@@ -4,168 +4,58 @@
  *
  *  Authors:
  *    Carl Hetherington <inkscape@carlh.net>
+ *    Diederik van Lierop <mail@diedenrezi.nl>
  *
  *  Released under GNU GPL, read the file 'COPYING' for more information.
  */
 
 #include "libnr/nr-values.h"
 #include "sp-namedview.h"
-
-Inkscape::Snapper::PointType const Inkscape::Snapper::BBOX_POINT = 0x1;
-Inkscape::Snapper::PointType const Inkscape::Snapper::SNAP_POINT = 0x2;
+#include "inkscape.h"
+#include "desktop.h"
 
 /**
  *  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), _distance(d)
-{
-    g_assert(_named_view != NULL);
-    g_assert(SP_IS_NAMEDVIEW(_named_view));
-    
-    setSnapTo(BBOX_POINT, true);
-}
-
-/**
- *  Set snap distance.
- *  \param d New snap distance (desktop coordinates)
- */
-void Inkscape::Snapper::setDistance(NR::Coord const d)
-{
-    _distance = d;
-}
-
-/**
- *  \return Snap distance (desktop coordinates)
- */
-NR::Coord Inkscape::Snapper::getDistance() const
-{
-    return _distance;
-}
-
-/**
- *  Turn on/off snapping of specific point types.
- *  \param t Point type.
- *  \param s true to snap to this point type, otherwise false;
- */
-void Inkscape::Snapper::setSnapTo(PointType t, bool s)
-{
-    if (s) {
-        _snap_to |= t;
-    } else {
-        _snap_to &= ~t;
-    }
-}
-
-/**
- *  \param t Point type.
- *  \return true if snapper will snap this type of point, otherwise false.
- */
-bool Inkscape::Snapper::getSnapTo(PointType t) const
-{
-    return (_snap_to & t);
-}
-
-/**
- *  \return true if this Snapper will snap at least one kind of point.
+ *  \param d Snap tolerance.
  */
-bool Inkscape::Snapper::willSnapSomething() const
+Inkscape::Snapper::Snapper(SnapManager const *sm, Geom::Coord const t) : 
+	_snapmanager(sm), 
+	_snap_enabled(true),
+	_snapper_tolerance(t)
 {
-    return (_snap_to != 0);
+    g_assert(_snapmanager != NULL);
 }
 
-
-
 /**
- *  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.
+ *  Set snap tolerance.
+ *  \param d New snap tolerance (desktop coordinates)
  */
-
-Inkscape::SnappedPoint Inkscape::Snapper::freeSnap(PointType t,
-                                                   NR::Point const &p,
-                                                   SPItem const *it) const
+void Inkscape::Snapper::setSnapperTolerance(Geom::Coord const d)
 {
-    std::list<SPItem const *> lit;
-    lit.push_back(it);
-    return freeSnap(t, p, lit);
+    _snapper_tolerance = d;
 }
 
-
 /**
- *  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.
+ *  \return Snap tolerance (desktop coordinates); depends on current zoom so that it's always the same in screen pixels
  */
-
-Inkscape::SnappedPoint Inkscape::Snapper::freeSnap(PointType t,
-                                                   NR::Point const &p,
-                                                   std::list<SPItem const *> const &it) const
+Geom::Coord Inkscape::Snapper::getSnapperTolerance() const
 {
-    if (getSnapTo(t) == false) {
-        return SnappedPoint(p, NR_HUGE);
-    }
-
-    return _doFreeSnap(p, it);
+    return _snapper_tolerance / SP_ACTIVE_DESKTOP->current_zoom();
 }
 
-
-
-
-/**
- *  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 t,
-                                                          NR::Point const &p,
-                                                          NR::Point const &c,
-                                                          SPItem const *it) const
+bool Inkscape::Snapper::getSnapperAlwaysSnap() const
 {
-    std::list<SPItem const *> lit;
-    lit.push_back(it);
-    return constrainedSnap(t, p, c, lit);
+    return _snapper_tolerance == 10000; //TODO: Replace this threshold of 10000 by a constant; see also tolerance-slider.cpp
 }
 
-
 /**
- *  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.
+ *  \param s true to enable this snapper, otherwise false.
  */
 
-Inkscape::SnappedPoint Inkscape::Snapper::constrainedSnap(PointType t,
-                                                          NR::Point const &p,
-                                                          NR::Point const &c,
-                                                          std::list<SPItem const *> const &it) const
+void Inkscape::Snapper::setEnabled(bool s)
 {
-    if (getSnapTo(t) == false) {
-        return SnappedPoint(p, NR_HUGE);
-    }
-
-    return _doConstrainedSnap(p, c, it);
+    _snap_enabled = s;
 }
 
 /*