Changeset 6013 for geovis

Timestamp:

Feb 15, 2016 11:38:15 AM (8 years ago)

Author:

ldelgass

Message:

Don't initiate a pick if the mouse was dragged more than 2 pixels. Prevents a
dragging pan from causing a selection.

Location:

geovis/trunk

Files:

• Picker.cpp (modified) (1 diff)
• Picker.h (modified) (1 diff)

geovis/trunk/Picker.cpp

@@ -238 +238 @@
 bool SelectCallback::accept(const osgGA::GUIEventAdapter& ea, const osgGA::GUIActionAdapter& aa)
 {
-    _renderer->mapMouseCoords(ea.getX(), ea.getY(), _pickPoint, false);
-    // Pick on click
-    return ea.getEventType() == ea.RELEASE;
+    if (ea.getEventType() == ea.PUSH) {
+        _x = ea.getX();
+        _y = ea.getY();
+        return false;
+    } else if (ea.getEventType() == ea.RELEASE) {
+        // Don't pick if mouse was dragged more than 2 pixels
+        if (fabsf(ea.getX()-_x) > 2 || fabsf(ea.getY()-_y) > 2) {
+            return false;
+        } else {
+            _renderer->mapMouseCoords(ea.getX(), ea.getY(), _pickPoint, false);
+            return true;
+        }
+    }
+    return false;
 }
 

geovis/trunk/Picker.h

@@ -37 +37 @@
 private:
     Renderer *_renderer;
+    float _x, _y;
     osgEarth::GeoPoint _pickPoint;
 };