Changeset 4322 for trunk/packages/vizservers/geovis

Timestamp:

Apr 7, 2014 12:08:00 AM (10 years ago)

Author:

ldelgass

Message:

Need to invert Y mouse coordinate input to mapMouseCoords if coords increase
top to bottom (i.e. for X11). osgGA::GUIEventAdapter events seem to have the
Y coordinate already inverted, so we don't need to invert coordinates when
inserting into the EventQueue?.

Location:

trunk/packages/vizservers/geovis

Files:

• Renderer.cpp (modified) (3 diffs)
• Renderer.h (modified) (1 diff)

trunk/packages/vizservers/geovis/Renderer.cpp

@@ -671 +671 @@
 }
 
-bool Renderer::mapMouseCoords(float mouseX, float mouseY, osgEarth::GeoPoint& map)
+/**
+ * \brief Map screen mouse coordinates to map coordinates
+ *
+ * This method assumes that mouse Y coordinates are 0 at the top
+ * of the screen and increase going down if invertY is set, and 
+ * 0 at the bottom and increase going up otherwise.
+ */
+bool Renderer::mapMouseCoords(float mouseX, float mouseY,
+                              osgEarth::GeoPoint& map, bool invertY)
 {
     if (!_mapNode.valid() || _mapNode->getTerrain() == NULL) {
@@ -680 +688 @@
         ERROR("No Viewer");
         return false;
+    }
+    if (invertY) {
+        mouseY = ((float)_windowHeight - mouseY);
     }
     osg::Vec3d world;
@@ -1203 +1214 @@
         }
 #else
-        if (_coordsCallback.valid()) {
-            osgEarth::GeoPoint map;
-            if (mapMouseCoords(x, y, map)) {
-                _coordsCallback->set(map, _viewer.get(), _mapNode);
+        if (_viewer.valid() && _coordsCallback.valid()) {
+            osgEarth::GeoPoint mapPt;
+            if (mapMouseCoords((float)x, (float)y, mapPt)) {
+                _coordsCallback->set(mapPt, _viewer->asView(), _mapNode);
             } else {
-                _coordsCallback->reset(_viewer.get(), _mapNode);
+                _coordsCallback->reset(_viewer->asView(), _mapNode);
             }
+            _needsRedraw = true;
         }
 #endif

trunk/packages/vizservers/geovis/Renderer.h

@@ -366 +366 @@
     osg::Image *getRenderedFrame();
 
-    bool mapMouseCoords(float mouseX, float mouseY, osgEarth::GeoPoint &pt);
+    bool mapMouseCoords(float mouseX, float mouseY,
+                        osgEarth::GeoPoint &pt, bool invertY = true);
 
     bool getMousePoint(double *x, double *y, double *z)