![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/snapper.h b/src/snapper.h
index 508ba7b9ad91dee834c396c82465c34bed2f16c6..f6e1a086e8a18c301e645e435c57c673fe526328 100644 (file)
--- a/src/snapper.h
+++ b/src/snapper.h
#include <list>
#include "libnr/nr-coord.h"
#include "libnr/nr-point.h"
-#include "libnr/nr-maybe.h"
+#include <boost/optional.hpp>
#include "snapped-point.h"
#include "snapped-line.h"
+#include "snapped-curve.h"
+#include "snap-preferences.h"
struct SnappedConstraints {
- std::list<Inkscape::SnappedPoint> points;
+ std::list<Inkscape::SnappedPoint> points;
std::list<Inkscape::SnappedLineSegment> lines;
std::list<Inkscape::SnappedLine> grid_lines;
std::list<Inkscape::SnappedLine> guide_lines;
+ std::list<Inkscape::SnappedCurve> curves;
};
-struct SPNamedView;
+class SnapManager;
struct SPItem;
namespace Inkscape
class Snapper
{
public:
- Snapper() {}
- Snapper(SPNamedView const *nv, ::NR::Coord const d);
- virtual ~Snapper() {}
-
- /// Point types to snap.
- typedef int PointType;
- static const PointType SNAPPOINT_NODE;
- static const PointType SNAPPOINT_BBOX;
- static const PointType SNAPPOINT_GUIDE;
-
- void setSnapFrom(PointType t, bool s);
- bool getSnapFrom(PointType t) const;
-
- void setSnapperTolerance(NR::Coord t);
- NR::Coord getSnapperTolerance() const; //returns the tolerance of the snapper in screen pixels (i.e. independent of zoom)
+ Snapper() {}
+ Snapper(SnapManager *sm, ::Geom::Coord const t);
+ virtual ~Snapper() {}
+
+ void setSnapperTolerance(Geom::Coord t);
+ Geom::Coord getSnapperTolerance() const; //returns the tolerance of the snapper in screen pixels (i.e. independent of zoom)
bool getSnapperAlwaysSnap() const; //if true, then the snapper will always snap, regardless of its tolerance
-
+
/**
* \return true if this Snapper will snap at least one kind of point.
*/
- virtual bool ThisSnapperMightSnap() const {return (_snap_enabled && _snap_from != 0);} // will likely be overridden by derived classes
+ //virtual bool ThisSnapperMightSnap() const;
+ virtual bool ThisSnapperMightSnap() const {return _snap_enabled;} // will likely be overridden by derived classes
void setEnabled(bool s);
bool getEnabled() const {return _snap_enabled;}
- void freeSnap(SnappedConstraints &sc,
- PointType const &t,
- NR::Point const &p,
- bool const &first_point,
- std::vector<NR::Point> &points_to_snap,
- SPItem const *it) const;
-
- void freeSnap(SnappedConstraints &sc,
- PointType const &t,
- NR::Point const &p,
- bool const &first_point,
- std::vector<NR::Point> &points_to_snap,
- std::list<SPItem const *> const &it,
- std::vector<NR::Point> *unselected_nodes) const;
-
+ virtual void freeSnap(SnappedConstraints &/*sc*/,
+ SnapPreferences::PointType const &/*t*/,
+ Geom::Point const &/*p*/,
+ bool const &/*first_point*/,
+ Geom::OptRect const &/*bbox_to_snap*/,
+ std::vector<SPItem const *> const */*it*/,
+ std::vector<Geom::Point> */*unselected_nodes*/) const {};
+
class ConstraintLine
{
public:
- ConstraintLine(NR::Point const &d) : _has_point(false), _direction(d) {}
- ConstraintLine(NR::Point const &p, NR::Point const &d) : _has_point(true), _point(p), _direction(d) {}
+ ConstraintLine(Geom::Point const &d) : _has_point(false), _direction(d) {}
+ ConstraintLine(Geom::Point const &p, Geom::Point const &d) : _has_point(true), _point(p), _direction(d) {}
bool hasPoint() const {
return _has_point;
}
- NR::Point getPoint() const {
+ Geom::Point getPoint() const {
return _point;
}
- NR::Point getDirection() const {
+ Geom::Point getDirection() const {
return _direction;
}
-
+
+ void setPoint(Geom::Point const &p) {
+ _point = p;
+ _has_point = true;
+ }
+
private:
bool _has_point;
- NR::Point _point;
- NR::Point _direction;
+ Geom::Point _point;
+ Geom::Point _direction;
};
- void constrainedSnap(SnappedConstraints &sc,
- PointType const &t,
- NR::Point const &p,
- bool const &first_point,
- std::vector<NR::Point> &points_to_snap,
- ConstraintLine const &c,
- SPItem const *it) const;
-
- void constrainedSnap(SnappedConstraints &sc,
- PointType const &t,
- NR::Point const &p,
- bool const &first_point,
- std::vector<NR::Point> &points_to_snap,
- ConstraintLine const &c,
- std::list<SPItem const *> const &it) const;
-
-protected:
- SPNamedView const *_named_view;
- int _snap_from; ///< bitmap of point types that we will snap from
- bool _snap_enabled; ///< true if this snapper is enabled, otherwise false
-
-private:
- NR::Coord _snapper_tolerance; ///< snap tolerance in desktop coordinates
- // must be private to enforce the usage of getTolerance(), which retrieves
- // the tolerance in screen pixels (making it zoom independent)
+ virtual void constrainedSnap(SnappedConstraints &/*sc*/,
+ SnapPreferences::PointType const &/*t*/,
+ Geom::Point const &/*p*/,
+ bool const &/*first_point*/,
+ Geom::OptRect const &/*bbox_to_snap*/,
+ ConstraintLine const &/*c*/,
+ std::vector<SPItem const *> const */*it*/) const {};
+protected:
+ SnapManager *_snapmanager;
- /**
- * 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 p Point to snap (desktop coordinates).
- * \param it Items that should not be snapped to.
- * \return Snapped point.
- */
- virtual void _doFreeSnap(SnappedConstraints &sc,
- PointType const &t,
- NR::Point const &p,
- bool const &first_point,
- std::vector<NR::Point> &points_to_snap,
- std::list<SPItem const *> const &it,
- std::vector<NR::Point> *unselected_nodes) const = 0;
+ bool _snap_enabled; ///< true if this snapper is enabled, otherwise false
- /**
- * 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.
- */
- virtual void _doConstrainedSnap(SnappedConstraints &sc,
- PointType const &t,
- NR::Point const &p,
- bool const &first_point,
- std::vector<NR::Point> &points_to_snap,
- ConstraintLine const &c,
- std::list<SPItem const *> const &it) const = 0;
+private:
+ Geom::Coord _snapper_tolerance; ///< snap tolerance in desktop coordinates
+ // must be private to enforce the usage of getTolerance(), which retrieves
+ // the tolerance in screen pixels (making it zoom independent)
};
}