![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/snapper.cpp b/src/snapper.cpp
index 5d39c6b02aeecd984b635b1bf6b677a2a44e09fd..fb7281c30bfb14647ab83f69b7cf5aa8bd4ffa8d 100644 (file)
--- a/src/snapper.cpp
+++ b/src/snapper.cpp
*
* 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"
#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)
- */
-void Inkscape::Snapper::setDistance(NR::Coord const d)
-{
- _distance = d;
-}
-
-/**
- * \return Snap distance (desktop coordinates); depends on current zoom so that it's always the same in screen pixels
- */
-NR::Coord Inkscape::Snapper::getDistance() const
-{
- return _distance / SP_ACTIVE_DESKTOP->current_zoom();
-}
-
-/**
- * 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::setSnapFrom(PointType t, bool s)
-{
- if (s) {
- _snap_from |= t;
- } else {
- _snap_from &= ~t;
- }
-}
-
-/**
- * \param t Point type.
- * \return true if snapper will snap this type of point, otherwise false.
+ * \param d Snap tolerance.
*/
-bool Inkscape::Snapper::getSnapFrom(PointType t) const
+Inkscape::Snapper::Snapper(SnapManager *sm, Geom::Coord const /*t*/) :
+ _snapmanager(sm),
+ _snap_enabled(true),
+ _snap_visible_only(true)
{
- return (_snap_from & t);
+ g_assert(_snapmanager != NULL);
}
/**
void Inkscape::Snapper::setEnabled(bool s)
{
- _enabled = s;
+ _snap_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
+void Inkscape::Snapper::setSnapVisibleOnly(bool s)
{
- std::list<SPItem const *> 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<SPItem const *> 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<SPItem const *> 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<SPItem const *> const &it) const
-{
- if (_enabled == false || getSnapFrom(t) == false) {
- return SnappedPoint(p, NR_HUGE);
- }
-
- return _doConstrainedSnap(t, p, c, it);
+ _snap_visible_only = s;
}
/*