diff --git a/src/snapper.h b/src/snapper.h
index 97068bf101b09b1b601f1da5f341a2dfacc3ebee..110b3d36ad5292fa721e1db7e55b76af01c5ce19 100644 (file)
--- a/src/snapper.h
+++ b/src/snapper.h
#include <map>
#include <list>
-#include "libnr/nr-coord.h"
-#include "libnr/nr-point.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;
class Snapper
{
public:
- Snapper() {}
- Snapper(SnapManager const *sm, ::Geom::Coord const d);
- virtual ~Snapper() {}
+ Snapper() {}
+ Snapper(SnapManager *sm, ::Geom::Coord const t);
+ 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(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
+ virtual Geom::Coord getSnapperTolerance() const = 0; //returns the tolerance of the snapper in screen pixels (i.e. independent of zoom)
+ virtual bool getSnapperAlwaysSnap() const = 0; //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 {return _snap_enabled;} // will likely be overridden by derived classes
+ // These four methods are only used for grids, for which snapping can be enabled individually
void setEnabled(bool s);
+ void setSnapVisibleOnly(bool s);
bool getEnabled() const {return _snap_enabled;}
+ bool getSnapVisibleOnly() const {return _snap_visible_only;}
virtual void freeSnap(SnappedConstraints &/*sc*/,
- PointType const &/*t*/,
+ SnapPreferences::PointType const &/*t*/,
Geom::Point const &/*p*/,
+ SnapSourceType const &/*source_type*/,
bool const &/*first_point*/,
- boost::optional<Geom::Rect> const &/*bbox_to_snap*/,
+ Geom::OptRect const &/*bbox_to_snap*/,
std::vector<SPItem const *> const */*it*/,
- std::vector<Geom::Point> */*unselected_nodes*/) const {};
+ std::vector<std::pair<Geom::Point, int> > */*unselected_nodes*/) const {};
class ConstraintLine
{
Geom::Point getDirection() const {
return _direction;
}
-
+
void setPoint(Geom::Point const &p) {
_point = p;
- _has_point = true;
+ _has_point = true;
+ }
+
+ Geom::Point projection(Geom::Point const &p) const { // returns the projection of p on this constraintline
+ Geom::Point const p1_on_cl = _has_point ? _point : p;
+ Geom::Point const p2_on_cl = p1_on_cl + _direction;
+ return Geom::projection(p, Geom::Line(p1_on_cl, p2_on_cl));
}
private:
};
virtual void constrainedSnap(SnappedConstraints &/*sc*/,
- PointType const &/*t*/,
+ SnapPreferences::PointType const &/*t*/,
Geom::Point const &/*p*/,
+ SnapSourceType const &/*source_type*/,
bool const &/*first_point*/,
- boost::optional<Geom::Rect> const &/*bbox_to_snap*/,
+ Geom::OptRect const &/*bbox_to_snap*/,
ConstraintLine const &/*c*/,
std::vector<SPItem const *> const */*it*/) const {};
protected:
- SnapManager const *_snapmanager;
- int _snap_from; ///< bitmap of point types that we will snap from
- bool _snap_enabled; ///< true if this snapper is enabled, otherwise false
-
-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)
+ SnapManager *_snapmanager;
+ // This is only used for grids, for which snapping can be enabled individually
+ bool _snap_enabled; ///< true if this snapper is enabled, otherwise false
+ bool _snap_visible_only;
};
}