![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/snap.cpp b/src/snap.cpp
index 4971bada40d83204a0c85f44f0a093838a7f1f6f..3dda92ecbcd73504c982a36737f9205cdc57a693 100644 (file)
--- a/src/snap.cpp
+++ b/src/snap.cpp
/**
* \file snap.cpp
- *
- * \brief Various snapping methods
+ * \brief SnapManager class.
*
* Authors:
* Lauris Kaplinski <lauris@kaplinski.com>
* Frank Felfe <innerspace@iname.com>
* Carl Hetherington <inkscape@carlh.net>
*
+ * Copyright (C) 2006-2007 Johan Engelen <johan@shouraizou.nl>
* Copyright (C) 1999-2002 Authors
*
* Released under GNU GPL, read the file 'COPYING' for more information
#include <libnr/nr-scale-ops.h>
#include <libnr/nr-values.h>
-SnapManager::SnapManager(SPNamedView const *v) : grid(v, 0), guide(v, 0), object(v, 0)
+#include "display/canvas-grid.h"
+
+#include "inkscape.h"
+#include "desktop.h"
+
+/**
+ * Construct a SnapManager for a SPNamedView.
+ *
+ * \param v `Owning' SPNamedView.
+ */
+
+SnapManager::SnapManager(SPNamedView const *v) :
+ guide(v, 0),
+ object(v, 0),
+ _named_view(v)
{
}
-SnapManager::SnapperList SnapManager::getSnappers() const
+
+/**
+ * \return List of snappers that we use.
+ */
+SnapManager::SnapperList
+SnapManager::getSnappers() const
{
SnapManager::SnapperList s;
- s.push_back(&grid);
s.push_back(&guide);
s.push_back(&object);
+
+ SnapManager::SnapperList gs = getGridSnappers();
+ s.splice(s.begin(), gs);
+
+ return s;
+}
+
+/**
+ * \return List of gridsnappers that we use.
+ */
+SnapManager::SnapperList
+SnapManager::getGridSnappers() const
+{
+ SnapperList s;
+
+ //FIXME: this code should actually do this: add new grid snappers that are active for this desktop. now it just adds all gridsnappers
+ SPDesktop* desktop = SP_ACTIVE_DESKTOP;
+ if (desktop && desktop->gridsEnabled()) {
+ for ( GSList const *l = _named_view->grids; l != NULL; l = l->next) {
+ Inkscape::CanvasGrid *grid = (Inkscape::CanvasGrid*) l->data;
+ s.push_back(grid->snapper);
+ }
+ }
+
return s;
}
/**
* \return true if one of the snappers will try to snap something.
*/
-bool SnapManager::willSnapSomething() const
+
+bool SnapManager::SomeSnapperMightSnap() const
{
SnapperList const s = getSnappers();
SnapperList::const_iterator i = s.begin();
- while (i != s.end() && (*i)->willSnapSomething() == false) {
+ while (i != s.end() && (*i)->ThisSnapperMightSnap() == false) {
i++;
}
+
return (i != s.end());
}
+
+/**
+ * Try to snap a point to any interested snappers.
+ *
+ * \param t Type of point.
+ * \param p Point.
+ * \param it Item to ignore when snapping.
+ * \return Snapped point.
+ */
+
Inkscape::SnappedPoint SnapManager::freeSnap(Inkscape::Snapper::PointType t,
NR::Point const &p,
SPItem const *it) const
}
+/**
+ * Try to snap a point to any interested snappers.
+ *
+ * \param t Type of point.
+ * \param p Point.
+ * \param it List of items to ignore when snapping.
+ * \return Snapped point.
+ */
+
Inkscape::SnappedPoint SnapManager::freeSnap(Inkscape::Snapper::PointType t,
NR::Point const &p,
std::list<SPItem const *> const &it) const
+{
+ SnapperList const snappers = getSnappers();
+
+ return freeSnap(t, p, it, snappers);
+}
+
+/**
+ * Try to snap a point to any of the specified snappers.
+ *
+ * \param t Type of point.
+ * \param p Point.
+ * \param it List of items to ignore when snapping.
+ * \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,
+ std::list<SPItem const *> const &it,
+ SnapperList const &snappers) const
{
Inkscape::SnappedPoint r(p, NR_HUGE);
- SnapperList const snappers = getSnappers();
for (SnapperList::const_iterator i = snappers.begin(); i != snappers.end(); i++) {
Inkscape::SnappedPoint const s = (*i)->freeSnap(t, p, it);
if (s.getDistance() < r.getDistance()) {
return r;
}
+/**
+ * Try to snap a point to any of the specified snappers. Snap always, ignoring the snap-distance
+ *
+ * \param t Type of point.
+ * \param p Point.
+ * \param it Item to ignore when snapping.
+ * \param snappers List of snappers to try to snap to
+ * \return Snapped point.
+ */
+
+Inkscape::SnappedPoint
+SnapManager::freeSnapAlways( Inkscape::Snapper::PointType t,
+ NR::Point const &p,
+ SPItem const *it,
+ SnapperList &snappers )
+{
+ std::list<SPItem const *> lit;
+ lit.push_back(it);
+ return freeSnapAlways(t, p, lit, snappers);
+}
+
+/**
+ * Try to snap a point to any of the specified snappers. Snap always, ignoring the snap-distance
+ *
+ * \param t Type of point.
+ * \param p Point.
+ * \param it List of items to ignore when snapping.
+ * \param snappers List of snappers to try to snap to
+ * \return Snapped point.
+ */
+
+Inkscape::SnappedPoint
+SnapManager::freeSnapAlways( Inkscape::Snapper::PointType t,
+ NR::Point const &p,
+ std::list<SPItem const *> const &it,
+ SnapperList &snappers )
+{
+ Inkscape::SnappedPoint r(p, NR_HUGE);
+
+ for (SnapperList::iterator i = snappers.begin(); i != snappers.end(); i++) {
+ gdouble const curr_gridsnap = (*i)->getDistance();
+ const_cast<Inkscape::Snapper*> (*i)->setDistance(NR_HUGE);
+ Inkscape::SnappedPoint const s = (*i)->freeSnap(t, p, it);
+ const_cast<Inkscape::Snapper*> (*i)->setDistance(curr_gridsnap);
+
+ if (s.getDistance() < r.getDistance()) {
+ r = s;
+ }
+ }
+
+ return r;
+}
+
+
+
+/**
+ * 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 p Point.
+ * \param c Constraint line.
+ * \param it Item to ignore when snapping.
+ * \return Snapped point.
+ */
Inkscape::SnappedPoint SnapManager::constrainedSnap(Inkscape::Snapper::PointType t,
NR::Point const &p,
@@ -89,6 +236,18 @@ Inkscape::SnappedPoint SnapManager::constrainedSnap(Inkscape::Snapper::PointType
}
+
+/**
+ * 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 p Point.
+ * \param c Constraint line.
+ * \param it List of items to ignore when snapping.
+ * \return Snapped point.
+ */
+
Inkscape::SnappedPoint SnapManager::constrainedSnap(Inkscape::Snapper::PointType t,
NR::Point const &p,
Inkscape::Snapper::ConstraintLine const &c,
@@ -108,6 +267,24 @@ Inkscape::SnappedPoint SnapManager::constrainedSnap(Inkscape::Snapper::PointType
}
+
+/**
+ * Main internal snapping method, which is called by the other, friendlier, public
+ * methods. It's a bit hairy as it has lots of parameters, but it saves on a lot
+ * of duplicated code.
+ *
+ * \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.
+ */
+
std::pair<NR::Point, bool> SnapManager::_snapTransformed(
Inkscape::Snapper::PointType type,
std::vector<NR::Point> const &points,
*/
/* Quick check to see if we have any snappers that are enabled */
- if (willSnapSomething() == false) {
+ if (SomeSnapperMightSnap() == false) {
return std::make_pair(transformation, false);
}
/* The current best transformation */
NR::Point best_transformation = transformation;
-
+
/* The current best metric for the best transformation; lower is better, NR_HUGE
** means that we haven't snapped anything.
*/
transformed = ((*i - origin) * s) + origin;
break;
}
+ case SKEW:
+ transformed = *i;
+ transformed[dim] += transformation[dim] * ((*i)[1 - dim] - origin[1 - dim]);
+ break;
default:
g_assert_not_reached();
}
-
+
/* Snap it */
Inkscape::SnappedPoint const snapped = constrained ?
constrainedSnap(type, transformed, constraint, ignore) : freeSnap(type, transformed, ignore);
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]);
+ break;
default:
g_assert_not_reached();
}
}
}
}
-
- return std::make_pair(best_transformation, best_metric < NR_HUGE);
+
+ // 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);
}
+/**
+ * Try to snap a list of points to any interested snappers after they have undergone
+ * a translation.
+ *
+ * \param t 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<NR::Point, bool> SnapManager::freeSnapTranslation(Inkscape::Snapper::PointType t,
std::vector<NR::Point> const &p,
std::list<SPItem const *> const &it,
@@ -227,6 +425,18 @@ std::pair<NR::Point, bool> SnapManager::freeSnapTranslation(Inkscape::Snapper::P
}
+/**
+ * Try to snap a list of points to any interested snappers after they have undergone a
+ * translation. A snap will only occur along a line described by a
+ * Inkscape::Snapper::ConstraintLine.
+ *
+ * \param t Type of points.
+ * \param p Points.
+ * \param it List of items to ignore when snapping.
+ * \param c Constraint line.
+ * \param tr Proposed translation.
+ * \return Snapped translation, if a snap occurred, and a flag indicating whether a snap occurred.
+ */
std::pair<NR::Point, bool> SnapManager::constrainedSnapTranslation(Inkscape::Snapper::PointType t,
std::vector<NR::Point> const &p,
@@ -239,6 +449,19 @@ std::pair<NR::Point, bool> 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 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<NR::scale, bool> SnapManager::freeSnapScale(Inkscape::Snapper::PointType t,
std::vector<NR::Point> const &p,
std::list<SPItem const *> const &it,
@@ -251,6 +474,19 @@ std::pair<NR::scale, bool> SnapManager::freeSnapScale(Inkscape::Snapper::PointTy
}
+/**
+ * Try to snap a list of points to any interested snappers after they have undergone
+ * a scale. A snap will only occur along a line described by a
+ * Inkscape::Snapper::ConstraintLine.
+ *
+ * \param t 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<NR::scale, bool> SnapManager::constrainedSnapScale(Inkscape::Snapper::PointType t,
std::vector<NR::Point> const &p,
std::list<SPItem const *> const &it,
@@ -264,6 +500,20 @@ std::pair<NR::scale, bool> 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 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.
+ * \param u true if the stretch should be uniform (ie to be applied equally in both dimensions)
+ * \return Snapped stretch, if a snap occurred, and a flag indicating whether a snap occurred.
+ */
+
std::pair<NR::Coord, bool> SnapManager::freeSnapStretch(Inkscape::Snapper::PointType t,
std::vector<NR::Point> const &p,
std::list<SPItem const *> const &it,
@@ -280,115 +530,33 @@ std::pair<NR::Coord, bool> SnapManager::freeSnapStretch(Inkscape::Snapper::Point
}
-
-/// Minimal distance to norm before point is considered for snap.
-static const double MIN_DIST_NORM = 1.0;
-
-/**
- * Try to snap \a req in one dimension.
- *
- * \param nv NamedView to use.
- * \param req Point to snap; updated to the snapped point if a snap occurred.
- * \param dim Dimension to snap in.
- * \return Distance to the snap point along the \a dim axis, or \c NR_HUGE
- * if no snap occurred.
- */
-NR::Coord namedview_dim_snap(SPNamedView const *nv, Inkscape::Snapper::PointType t, NR::Point &req,
- NR::Dim2 const dim, SPItem const *it)
-{
- return namedview_vector_snap(nv, t, req, component_vectors[dim], it);
-}
-
-NR::Coord namedview_dim_snap(SPNamedView const *nv, Inkscape::Snapper::PointType t, NR::Point &req,
- NR::Dim2 const dim, std::list<SPItem const *> const &it)
-{
- return namedview_vector_snap(nv, t, req, component_vectors[dim], it);
-}
-
-
-NR::Coord namedview_vector_snap(SPNamedView const *nv, Inkscape::Snapper::PointType t,
- NR::Point &req, NR::Point const &d,
- SPItem const *it)
-{
- std::list<SPItem const *> lit;
- lit.push_back(it);
- return namedview_vector_snap(nv, t, req, d, lit);
-}
-
/**
- * Look for snap point along the line described by the point \a req
- * and the direction vector \a d.
- * Modifies req to the snap point, if one is found.
- * \return The distance from \a req to the snap point along the vector \a d,
- * or \c NR_HUGE if no snap point was found.
- *
- * \pre d \81â\89\81 (0, 0).
- */
-NR::Coord namedview_vector_snap(SPNamedView const *nv, Inkscape::Snapper::PointType t,
- NR::Point &req, NR::Point const &d,
- std::list<SPItem const *> const &it)
-{
- g_assert(nv != NULL);
- g_assert(SP_IS_NAMEDVIEW(nv));
-
- SnapManager::SnapperList const snappers = nv->snap_manager.getSnappers();
-
- NR::Coord best = NR_HUGE;
- for (SnapManager::SnapperList::const_iterator i = snappers.begin(); i != snappers.end(); i++) {
- Inkscape::SnappedPoint const s = (*i)->constrainedSnap(t, req, d, it);
- if (s.getDistance() < best) {
- req = s.getPoint();
- best = s.getDistance();
- }
- }
-
- return best;
-}
-
-
-/*
- * functions for lists of points
+ * Try to snap a list of points to any interested snappers after they have undergone
+ * a skew.
*
- * All functions take a list of NR::Point and parameter indicating the proposed transformation.
- * They return the updated transformation parameter.
+ * \param t 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.
*/
-/**
- * Try to snap points after they have been skewed.
- */
-double namedview_dim_snap_list_skew(SPNamedView const *nv, Inkscape::Snapper::PointType t,
- const std::vector<NR::Point> &p, NR::Point const &norm,
- double const sx, NR::Dim2 const dim)
+std::pair<NR::Coord, bool> SnapManager::freeSnapSkew(Inkscape::Snapper::PointType t,
+ std::vector<NR::Point> const &p,
+ std::list<SPItem const *> const &it,
+ NR::Coord const &s,
+ NR::Point const &o,
+ NR::Dim2 d) const
{
- SnapManager const &m = nv->snap_manager;
-
- if (m.willSnapSomething() == false) {
- return sx;
- }
-
- g_assert(dim < 2);
-
- gdouble dist = NR_HUGE;
- gdouble skew = sx;
-
- for (std::vector<NR::Point>::const_iterator i = p.begin(); i != p.end(); i++) {
- NR::Point q = *i;
- NR::Point check = q;
- // apply shear
- check[dim] += sx * (q[!dim] - norm[!dim]);
- if (fabs (q[!dim] - norm[!dim]) > MIN_DIST_NORM) {
- const gdouble d = namedview_dim_snap (nv, t, check, dim, NULL);
- if (d < fabs (dist)) {
- dist = d;
- skew = (check[dim] - q[dim]) / (q[!dim] - norm[!dim]);
- }
- }
- }
+ std::pair<NR::Point, bool> const r = _snapTransformed(
+ t, p, it, false, NR::Point(), SKEW, NR::Point(s, s), o, d, false
+ );
- return skew;
+ return std::make_pair(r.first[d], r.second);
}
-
/*
Local Variables:
mode:c++