![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/snap.h b/src/snap.h
index df08602746c3609ed214ac3cadd403ab8f8cdc8a..eba18f5deae5ce6e926672d85c76b43b860be3b4 100644 (file)
--- a/src/snap.h
+++ b/src/snap.h
#include "guide-snapper.h"
#include "object-snapper.h"
+#include "snap-preferences.h"
class SPNamedView;
class SnapManager
{
public:
- SnapManager(SPNamedView const *v);
+ enum Transformation {
+ TRANSLATION,
+ SCALE,
+ STRETCH,
+ SKEW
+ };
+
+ SnapManager(SPNamedView const *v);
typedef std::list<const Inkscape::Snapper*> SnapperList;
- bool SomeSnapperMightSnap() const;
-
- void setup(SPDesktop const *desktop, bool snapindicator = true, SPItem const *item_to_ignore = NULL, std::vector<Geom::Point> *unselected_nodes = NULL);
- void setup(SPDesktop const *desktop, bool snapindicator, std::vector<SPItem const *> &items_to_ignore, std::vector<Geom::Point> *unselected_nodes = NULL);
-
- // freeSnapReturnByRef() is preferred over freeSnap(), because it only returns a
- // point if snapping has occured (by overwriting p); otherwise p is untouched
- void freeSnapReturnByRef(Inkscape::Snapper::PointType point_type,
- Geom::Point &p,
- bool first_point = true,
- boost::optional<Geom::Rect> const &bbox_to_snap = boost::optional<Geom::Rect>()) const;
-
- Inkscape::SnappedPoint freeSnap(Inkscape::Snapper::PointType point_type,
- Geom::Point const &p,
- bool first_point = true,
- boost::optional<Geom::Rect> const &bbox_to_snap = boost::optional<Geom::Rect>() ) const;
-
+ bool someSnapperMightSnap() const;
+ bool gridSnapperMightSnap() const;
+
+ void setup(SPDesktop const *desktop,
+ bool snapindicator = true,
+ SPItem const *item_to_ignore = NULL,
+ std::vector<std::pair<Geom::Point, int> > *unselected_nodes = NULL,
+ SPGuide *guide_to_ignore = NULL);
+
+ void setup(SPDesktop const *desktop,
+ bool snapindicator,
+ std::vector<SPItem const *> &items_to_ignore,
+ std::vector<std::pair<Geom::Point, int> > *unselected_nodes = NULL,
+ SPGuide *guide_to_ignore = NULL);
+
+ // freeSnapReturnByRef() is preferred over freeSnap(), because it only returns a
+ // point if snapping has occurred (by overwriting p); otherwise p is untouched
+ void freeSnapReturnByRef(Inkscape::SnapPreferences::PointType point_type,
+ Geom::Point &p,
+ Inkscape::SnapSourceType const source_type,
+ bool first_point = true,
+ Geom::OptRect const &bbox_to_snap = Geom::OptRect()) const;
+
+
+ Inkscape::SnappedPoint freeSnap(Inkscape::SnapPreferences::PointType point_type,
+ Geom::Point const &p,
+ Inkscape::SnapSourceType const &source_type,
+ bool first_point = true,
+ Geom::OptRect const &bbox_to_snap = Geom::OptRect() ) const;
+
Geom::Point multipleOfGridPitch(Geom::Point const &t) const;
-
- // constrainedSnapReturnByRef() is preferred over constrainedSnap(), because it only returns a
- // point, by overwriting p, if snapping has occured; otherwise p is untouched
- void constrainedSnapReturnByRef(Inkscape::Snapper::PointType point_type,
- Geom::Point &p,
- Inkscape::Snapper::ConstraintLine const &constraint,
- bool first_point = true,
- boost::optional<Geom::Rect> const &bbox_to_snap = boost::optional<Geom::Rect>()) const;
-
- Inkscape::SnappedPoint constrainedSnap(Inkscape::Snapper::PointType point_type,
- Geom::Point const &p,
- Inkscape::Snapper::ConstraintLine const &constraint,
+
+ // constrainedSnapReturnByRef() is preferred over constrainedSnap(), because it only returns a
+ // point, by overwriting p, if snapping has occurred; otherwise p is untouched
+ void constrainedSnapReturnByRef(Inkscape::SnapPreferences::PointType point_type,
+ Geom::Point &p,
+ Inkscape::SnapSourceType const source_type,
+ Inkscape::Snapper::ConstraintLine const &constraint,
+ bool first_point = true,
+ Geom::OptRect const &bbox_to_snap = Geom::OptRect()) const;
+
+ Inkscape::SnappedPoint constrainedSnap(Inkscape::SnapPreferences::PointType point_type,
+ Geom::Point const &p,
+ Inkscape::SnapSourceType const &source_type,
+ Inkscape::Snapper::ConstraintLine const &constraint,
bool first_point = true,
- boost::optional<Geom::Rect> const &bbox_to_snap = boost::optional<Geom::Rect>()) const;
-
+ Geom::OptRect const &bbox_to_snap = Geom::OptRect()) const;
+
void guideSnap(Geom::Point &p, Geom::Point const &guide_normal) const;
- Inkscape::SnappedPoint freeSnapTranslation(Inkscape::Snapper::PointType point_type,
- std::vector<Geom::Point> const &p,
+ Inkscape::SnappedPoint freeSnapTranslation(Inkscape::SnapPreferences::PointType point_type,
+ std::vector<std::pair<Geom::Point, int> > const &p,
+ Geom::Point const &pointer,
Geom::Point const &tr) const;
- Inkscape::SnappedPoint constrainedSnapTranslation(Inkscape::Snapper::PointType point_type,
- std::vector<Geom::Point> const &p,
+ Inkscape::SnappedPoint constrainedSnapTranslation(Inkscape::SnapPreferences::PointType point_type,
+ std::vector<std::pair<Geom::Point, int> > const &p,
+ Geom::Point const &pointer,
Inkscape::Snapper::ConstraintLine const &constraint,
Geom::Point const &tr) const;
- Inkscape::SnappedPoint freeSnapScale(Inkscape::Snapper::PointType point_type,
- std::vector<Geom::Point> const &p,
+ Inkscape::SnappedPoint freeSnapScale(Inkscape::SnapPreferences::PointType point_type,
+ std::vector<std::pair<Geom::Point, int> > const &p,
+ Geom::Point const &pointer,
Geom::Scale const &s,
Geom::Point const &o) const;
- Inkscape::SnappedPoint constrainedSnapScale(Inkscape::Snapper::PointType point_type,
- std::vector<Geom::Point> const &p,
+ Inkscape::SnappedPoint constrainedSnapScale(Inkscape::SnapPreferences::PointType point_type,
+ std::vector<std::pair<Geom::Point, int> > const &p,
+ Geom::Point const &pointer,
Geom::Scale const &s,
Geom::Point const &o) const;
- Inkscape::SnappedPoint constrainedSnapStretch(Inkscape::Snapper::PointType point_type,
- std::vector<Geom::Point> const &p,
+ Inkscape::SnappedPoint constrainedSnapStretch(Inkscape::SnapPreferences::PointType point_type,
+ std::vector<std::pair<Geom::Point, int> > const &p,
+ Geom::Point const &pointer,
Geom::Coord const &s,
Geom::Point const &o,
Geom::Dim2 d,
bool uniform) const;
- Inkscape::SnappedPoint constrainedSnapSkew(Inkscape::Snapper::PointType point_type,
- std::vector<Geom::Point> const &p,
+ Inkscape::SnappedPoint constrainedSnapSkew(Inkscape::SnapPreferences::PointType point_type,
+ std::vector<std::pair<Geom::Point, int> > const &p,
+ Geom::Point const &pointer,
Inkscape::Snapper::ConstraintLine const &constraint,
Geom::Point const &s, // s[0] = skew factor, s[1] = scale factor
Geom::Point const &o,
Geom::Dim2 d) const;
-
+
Inkscape::GuideSnapper guide; ///< guide snapper
Inkscape::ObjectSnapper object; ///< snapper to other objects
+ Inkscape::SnapPreferences snapprefs;
SnapperList getSnappers() const;
SnapperList getGridSnappers() const;
-
+
SPDesktop const *getDesktop() const {return _desktop;}
SPNamedView const *getNamedView() const {return _named_view;}
SPDocument *getDocument() const;
-
- void setSnapModeBBox(bool enabled);
- void setSnapModeNode(bool enabled);
- void setSnapModeGuide(bool enabled);
- bool getSnapModeBBox() const;
- bool getSnapModeNode() const;
- bool getSnapModeGuide() const;
-
- void setSnapIntersectionGG(bool enabled) {_intersectionGG = enabled;}
- void setSnapIntersectionCS(bool enabled) {_intersectionCS = enabled;}
- bool getSnapIntersectionGG() {return _intersectionGG;}
- bool getSnapIntersectionCS() {return _intersectionCS;}
-
- void setIncludeItemCenter(bool enabled) {
- _include_item_center = enabled;
- // also store a local copy in the object-snapper instead of passing it through many functions
- object.setIncludeItemCenter(enabled);
- }
-
- bool getIncludeItemCenter() const {
- return _include_item_center;
- }
-
- void setSnapEnabledGlobally(bool enabled) {
- _snap_enabled_globally = enabled;
- }
-
- bool getSnapEnabledGlobally() const {
- return _snap_enabled_globally;
- }
-
- void toggleSnapEnabledGlobally() {
- _snap_enabled_globally = !_snap_enabled_globally;
- }
-
+ SPGuide const *getGuideToIgnore() const {return _guide_to_ignore;}
+
+ bool getSnapIndicator() const {return _snapindicator;}
+
protected:
SPNamedView const *_named_view;
private:
-
- enum Transformation {
- TRANSLATION,
- SCALE,
- STRETCH,
- SKEW
- };
-
- bool _include_item_center; //If true, snapping nodes will also snap the item's center
- bool _intersectionGG;
- bool _intersectionCS;
- bool _snap_enabled_globally; //Toggles ALL snapping
-
std::vector<SPItem const *> *_items_to_ignore;
SPItem const *_item_to_ignore;
+ SPGuide *_guide_to_ignore;
SPDesktop const *_desktop;
bool _snapindicator;
- std::vector<Geom::Point> *_unselected_nodes;
-
- Inkscape::SnappedPoint _snapTransformed(Inkscape::Snapper::PointType type,
- std::vector<Geom::Point> const &points,
+ std::vector<std::pair<Geom::Point, int> > *_unselected_nodes;
+
+ Inkscape::SnappedPoint _snapTransformed(Inkscape::SnapPreferences::PointType type,
+ std::vector<std::pair<Geom::Point, int> > const &points,
+ Geom::Point const &pointer,
bool constrained,
Inkscape::Snapper::ConstraintLine const &constraint,
Transformation transformation_type,
Geom::Point const &origin,
Geom::Dim2 dim,
bool uniform) const;
-
- Inkscape::SnappedPoint findBestSnap(Geom::Point const &p, SnappedConstraints &sc, bool constrained) const;
+
+ Geom::Point _transformPoint(std::pair<Geom::Point, int> const &p,
+ Transformation const transformation_type,
+ Geom::Point const &transformation,
+ Geom::Point const &origin,
+ Geom::Dim2 const dim,
+ bool const uniform) const;
+
+ void _displaySnapsource(Inkscape::SnapPreferences::PointType point_type, std::pair<Geom::Point, int> const &p) const;
+
+ Inkscape::SnappedPoint findBestSnap(Geom::Point const &p, Inkscape::SnapSourceType const source_type, SnappedConstraints &sc, bool constrained) const;
};
#endif /* !SEEN_SNAP_H */