Connector tool: make connectors avoid the convex hull of shapes.

[inkscape.git] / src / snapper.h

diff --git a/src/snapper.h b/src/snapper.h
index f6e1a086e8a18c301e645e435c57c673fe526328..110b3d36ad5292fa721e1db7e55b76af01c5ce19 100644 (file)
--- a/src/snapper.h
+++ b/src/snapper.h
@@ -14,8 +14,6 @@
 
 #include <map>
 #include <list>
-#include "libnr/nr-coord.h"
-#include "libnr/nr-point.h"
 #include <boost/optional.hpp>
 
 #include "snapped-point.h"
@@ -45,26 +43,28 @@ public:
        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
+    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;
     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*/,
                           SnapPreferences::PointType const &/*t*/,
                           Geom::Point const &/*p*/,
+                          SnapSourceType const &/*source_type*/,
                           bool const &/*first_point*/,
                           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
     {
@@ -89,6 +89,12 @@ public:
             _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:
 
         bool _has_point;
@@ -99,6 +105,7 @@ public:
     virtual void constrainedSnap(SnappedConstraints &/*sc*/,
                                                         SnapPreferences::PointType const &/*t*/,
                                  Geom::Point const &/*p*/,
+                                 SnapSourceType const &/*source_type*/,
                                  bool const &/*first_point*/,
                                  Geom::OptRect const &/*bbox_to_snap*/,
                                  ConstraintLine const &/*c*/,
@@ -107,12 +114,9 @@ public:
 protected:
        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
-
-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)
+       bool _snap_visible_only;
 };
 
 }