now that selection description includes style (filtered, clipped), we need to update...

[inkscape.git] / src / object-snapper.h

diff --git a/src/object-snapper.h b/src/object-snapper.h
index 9972677e0c301c1461b2960a2834c6f05380ca90..74bdec0cef3bad0a2ac04385943b7ea0ce7c6c57 100644 (file)
--- a/src/object-snapper.h
+++ b/src/object-snapper.h
@@ -46,48 +46,41 @@ class ObjectSnapper : public Snapper
 {
 
 public:
-    ObjectSnapper(SnapManager *sm, Geom::Coord const d);
+       ObjectSnapper(SnapManager *sm, Geom::Coord const d);
     ~ObjectSnapper();
 
-      enum DimensionToSnap {
-          GUIDE_TRANSL_SNAP_X, // For snapping a vertical guide (normal in the X-direction) to objects,
-          GUIDE_TRANSL_SNAP_Y, // For snapping a horizontal guide (normal in the Y-direction) to objects
-          ANGLED_GUIDE_TRANSL_SNAP, // For snapping an angled guide, while translating it accross the desktop
-          ANGLED_GUIDE_ROT_SNAP, // For snapping an angled guide, while rotating it around some pivot point
-          TRANSL_SNAP_XY}; // All other cases; for snapping to objects, other than guides
-
-    void setSnapToItemNode(bool s) {_snap_to_itemnode = s;}
-      bool getSnapToItemNode() const {return _snap_to_itemnode;}
-      void setSnapToItemPath(bool s) {_snap_to_itempath = s;}
-      bool getSnapToItemPath() const {return _snap_to_itempath;}
-      void setSnapToBBoxNode(bool s) {_snap_to_bboxnode = s;}
-      bool getSnapToBBoxNode() const {return _snap_to_bboxnode;}
-      void setSnapToBBoxPath(bool s) {_snap_to_bboxpath = s;}
-      bool getSnapToBBoxPath() const {return _snap_to_bboxpath;}
-      void setSnapToPageBorder(bool s) {_snap_to_page_border = s;}
-      bool getSnapToPageBorder() const {return _snap_to_page_border;}
-      void guideSnap(SnappedConstraints &sc,
-                   Geom::Point const &p,
-                 Geom::Point const &guide_normal) const;
-
-      bool ThisSnapperMightSnap() const;
-      bool GuidesMightSnap() const;
-
-      void freeSnap(SnappedConstraints &sc,
-                      Inkscape::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;
-
-      void constrainedSnap(SnappedConstraints &sc,
-                      Inkscape::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;
+       enum DimensionToSnap {
+               GUIDE_TRANSL_SNAP_X, // For snapping a vertical guide (normal in the X-direction) to objects,
+               GUIDE_TRANSL_SNAP_Y, // For snapping a horizontal guide (normal in the Y-direction) to objects
+               ANGLED_GUIDE_TRANSL_SNAP, // For snapping an angled guide, while translating it accross the desktop
+               ANGLED_GUIDE_ROT_SNAP, // For snapping an angled guide, while rotating it around some pivot point
+               TRANSL_SNAP_XY}; // All other cases; for snapping to objects, other than guides
+
+       void guideSnap(SnappedConstraints &sc,
+                                  Geom::Point const &p,
+                                  Geom::Point const &guide_normal) const;
+
+       bool ThisSnapperMightSnap() const;
+       bool GuidesMightSnap() const;
+
+       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
+
+       void freeSnap(SnappedConstraints &sc,
+                                 Inkscape::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;
+
+       void constrainedSnap(SnappedConstraints &sc,
+                                 Inkscape::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;
 
 private:
     //store some lists of candidates, points and paths, so we don't have to rebuild them for each point we want to snap
@@ -140,19 +133,10 @@ private:
     Geom::PathVector* _getPathvFromRect(Geom::Rect const rect) const;
     void _getBorderNodes(std::vector<Geom::Point> *points) const;
 
-    bool _snap_to_itemnode;
-    bool _snap_to_itempath;
-    bool _snap_to_bboxnode;
-    bool _snap_to_bboxpath;
-    bool _snap_to_page_border;
-
-    //If enabled, then bbox corners will only snap to bboxes,
-    //and nodes will only snap to nodes and paths. We will not
-    //snap bbox corners to nodes, or nodes to bboxes.
-    //(snapping to grids and guides is not affected by this)
-    bool _strict_snapping;
-};
+}; // end of ObjectSnapper class
+
+void getBBoxPoints(Geom::OptRect const bbox, std::vector<Geom::Point> *points, bool const includeCorners, bool const includeLineMidpoints, bool const includeObjectMidpoints);
 
-}
+} // end of namespace Inkscape
 
 #endif