Changeset 6002 for geovis

Timestamp:

Feb 11, 2016 1:49:00 PM (8 years ago)

Author:

ldelgass

Message:

Add 'select clear' protocol command, clear previous selection on 'select
feature...' command

Location:

geovis/trunk

Files:

• Picker.cpp (modified) (4 diffs)
• Picker.h (modified) (1 diff)
• RenderServer.h (modified) (1 diff)
• Renderer.cpp (modified) (2 diffs)
• Renderer.h (modified) (2 diffs)
• RendererCmd.cpp (modified) (3 diffs)

geovis/trunk/Picker.cpp

@@ -201 +201 @@
         INFO("Hit feature ID: %lu (of %d) layer: %s", feature->getFID(), index->size(), layerName.c_str());
 
-        clearSelection();
+        _renderer->clearSelection();
 
         const osgEarth::Features::AttributeTable &attrs = feature->getAttrs();
@@ -218 +218 @@
         queueResponse(mesg, length, Response::VOLATILE, Response::DATA);
     } else {
-        clearSelection();
+        _renderer->clearSelection();
         osgEarth::Annotation::AnnotationNode* anno =
             osgEarth::Registry::objectIndex()->get<osgEarth::Annotation::AnnotationNode>(id);
@@ -236 +236 @@
 {
     INFO("Select miss");
-    clearSelection();
+    _renderer->clearSelection();
     clearHighlight();
 
@@ -244 +244 @@
 
     _renderer->eventuallyRender();
-}
-
-void SelectCallback::clearSelection()
-{
-    osg::Group *nodes = _renderer->getAnnotations();
-    std::vector<osg::Node *> toRemove;
-    for (unsigned int i = 0; i < nodes->getNumChildren(); i++) {
-        osg::Node *node = nodes->getChild(i);
-        if (dynamic_cast<osgEarth::Annotation::OrthoNode *>(node) != NULL) {
-            toRemove.push_back(node);
-        }
-    }
-    for (std::vector<osg::Node *>::iterator itr = toRemove.begin();
-         itr != toRemove.end(); ++itr) {
-        nodes->removeChild(*itr);
-    }
 }
 

geovis/trunk/Picker.h

@@ -35 +35 @@
     bool accept(const osgGA::GUIEventAdapter& ea, const osgGA::GUIActionAdapter& aa);
 
-    void clearSelection();
-
 private:
     Renderer *_renderer;

geovis/trunk/RenderServer.h

@@ -21 +21 @@
 class Stats;
 
-#define GEOVIS_VERSION_STRING "0.7.0"
+#define GEOVIS_VERSION_STRING "0.7.1"
 
 #define MSECS_ELAPSED(t1, t2) \

geovis/trunk/Renderer.cpp

@@ -1530 +1530 @@
 {
     TRACE("Select layer '%s', num features: %u", layerName, featureIDs.size());
+    clearSelection();
     if (featureIDs.size() == 0) {
         // clear selection
@@ -1564 +1565 @@
         _needsRedraw = true;
     }
+}
+
+void Renderer::clearSelection()
+{
+    clearHighlight();
+    clearSelectionAnnotationNodes();
+    clearBoxSelection();
+    _needsRedraw = true;
+}
+
+/**
+ * \brief Remove annotation nodes created during a pick/selection
+ * 
+ * The primary purpose of this method is to take down the feature placard
+ */
+void Renderer::clearSelectionAnnotationNodes()
+{
+    osg::Group *nodes = getAnnotations();
+    std::vector<osg::Node *> toRemove;
+    for (unsigned int i = 0; i < nodes->getNumChildren(); i++) {
+        osg::Node *node = nodes->getChild(i);
+        // This can be Placard, PlacardLabel, Label, Place or Track Node
+        if (dynamic_cast<osgEarth::Annotation::OrthoNode *>(node) != NULL) {
+            toRemove.push_back(node);
+        }
+    }
+    for (std::vector<osg::Node *>::iterator itr = toRemove.begin();
+         itr != toRemove.end(); ++itr) {
+        nodes->removeChild(*itr);
+    }
+    _needsRedraw = true;
 }
 

geovis/trunk/Renderer.h

@@ -519 +519 @@
     void selectFeatures(std::vector<unsigned long>& featureIDs, const char *layerName);
 
+    void clearSelection();
+
     void addRhumbBox(double latMin, double latMax, double longMin, double longMax);
 
@@ -569 +571 @@
 
     void initAnnotations();
+
+    void clearSelectionAnnotationNodes();
 
     void initViewer();

geovis/trunk/RendererCmd.cpp

@@ -3380 +3380 @@
 
 static int
-SelectFeatureOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+SelectClearOp(ClientData clientData, Tcl_Interp *interp, int objc,
+              Tcl_Obj *const *objv)
+{
+    g_renderer->clearSelection();
+    return TCL_OK;
+}
+
+static int
+SelectFeatureOp(ClientData clientData, Tcl_Interp *interp, int objc,
                 Tcl_Obj *const *objv)
 {
@@ -3407 +3415 @@
 
 static int
-SelectModeOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+SelectModeOp(ClientData clientData, Tcl_Interp *interp, int objc,
              Tcl_Obj *const *objv)
 {
-    //const char *modeStr = Tcl_GetString(objv[2]);
+    const char *modeStr = Tcl_GetString(objv[2]);
     // Parse mode string
     //Renderer::SelectMode mode;
@@ -3418 +3426 @@
 
 static CmdSpec selectOps[] = {
+    {"clear",   1, SelectClearOp,   2, 2, ""},
     {"feature", 1, SelectFeatureOp, 4, 4, "idlist layerName"},
-    {"mode",    1, SelectModeOp, 3, 3, "mode"},
+    {"mode",    1, SelectModeOp,    3, 3, "mode"},
 };
 static int nSelectOps = NumCmdSpecs(selectOps);