Changeset 6002 for geovis/trunk/Picker.cpp

Timestamp:

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

Author:

ldelgass

Message:

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

File:

• geovis/trunk/Picker.cpp (modified) (4 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);
-    }
 }