Changeset 6050 for geovis

Timestamp:

Feb 24, 2016 6:40:50 PM (8 years ago)

Author:

ldelgass

Message:

Add simple on/off select mode

Location:

geovis/trunk

Files:

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

geovis/trunk/Renderer.cpp

@@ -1528 +1528 @@
             _picker->addChild(_placeNodes.get());
         }
+    }
+}
+
+void Renderer::setSelectMode(SelectMode mode)
+{
+    _selectMode = mode;
+    switch (_selectMode) {
+    case SELECT_OFF: {
+#ifdef USE_RTT_PICKER
+        if (_picker.valid()) {
+            _viewer->removeEventHandler(_picker.get());
+            _picker = NULL;
+        }
+#endif
+    }
+        break;
+    case SELECT_ON: {
+#ifdef USE_RTT_PICKER
+        if (!_picker.valid()) {
+            _picker = new osgEarth::Util::RTTPicker;
+            _picker->addChild(_mapNode);
+            osg::ref_ptr<SelectCallback> callback = new SelectCallback(this);
+            _picker->setDefaultCallback(callback.get());
+            _viewer->addEventHandler(_picker.get());
+        }
+#endif
+    }
+        break;
+    default:
+        ERROR("Unknown select mode");
     }
 }

geovis/trunk/Renderer.h

@@ -136 +136 @@
     };
 
+    enum SelectMode {
+        SELECT_OFF,
+        SELECT_ON
+    };
+
     Renderer();
     virtual ~Renderer();
@@ -519 +524 @@
     void setPlacardConfig(const Placard& placardConf, const char *layerName);
 
+    void setSelectMode(SelectMode mode);
+
     void selectFeatures(std::vector<unsigned long>& featureIDs, const char *layerName);
 
@@ -628 +635 @@
     PlacardHashmap _placardConfigs;
     double _anchorLat, _anchorLong;
+    SelectMode _selectMode;
     osg::ref_ptr<osgEarth::Annotation::FeatureNode> _selectionBox;
 #ifdef USE_RTT_PICKER

geovis/trunk/RendererCmd.cpp

@@ -3434 +3434 @@
     const char *modeStr = Tcl_GetString(objv[2]);
     // Parse mode string
-    //Renderer::SelectMode mode;
-    //g_renderer->setSelectMode(mode);
+    Renderer::SelectMode mode Renderer::SELECT_OFF;
+    if (modeStr[0] == 'o' && strcmp(modeStr, "off") == 0) {
+        mode = Renderer::SELECT_OFF;
+    } else if (modeStr[0] == 'o' && strcmp(modeStr, "on") == 0) {
+        mode = Renderer::SELECT_ON;
+    } else {
+        Tcl_AppendResult(interp, "bad select mode \"", modeStr,
+                             "\": must be 'on' or 'off'", (char*)NULL);
+        return TCL_ERROR;
+    }
+    g_renderer->setSelectMode(mode);
     return TCL_OK;
 }