Changeset 6253 for geovis/trunk

Timestamp:

Apr 7, 2016, 6:35:03 AM (8 years ago)

Author:

ldelgass

Message:

selection debug display

Location:

geovis/trunk

Files:

• MouseCoordsTool.h (modified) (1 diff)
• Picker.cpp (modified) (1 diff)
• Renderer.cpp (modified) (7 diffs)
• Renderer.h (modified) (2 diffs)

geovis/trunk/MouseCoordsTool.h

@@ -56 +56 @@
         // Out of range of map extents
         if (_label.valid()) {
-            _label->setText("");
+            _label->setText(osgEarth::Stringify()
+                            << _prefix
+                            << "N/A");
         }
         _havePoint = false;

geovis/trunk/Picker.cpp

@@ -204 +204 @@
         TRACE("Hit feature ID: %lu (of %d) layer: %s", feature->getFID(), index->size(), layerName.c_str());
 
-        _renderer->clearSelection();
+        std::vector<unsigned long> fids;
+        fids.push_back(feature->getFID());
+        _renderer->selectFeatures(fids, layerName.c_str(), true);
         _renderer->addPlacard(_pickPoint, feature, layerName.c_str());
 

geovis/trunk/Renderer.cpp

@@ -495 +495 @@
 void Renderer::initControls()
 {
+    if (!_debugBox.valid()) {
+        _debugBox = 
+            new osgEarth::Util::Controls::HBox(osgEarth::Util::Controls::Control::ALIGN_RIGHT,
+                                               osgEarth::Util::Controls::Control::ALIGN_TOP,
+                                               osgEarth::Util::Controls::Gutter(0, 2, 2, 0), 2.0f);
+        _debugLabel = 
+            new osgEarth::Util::Controls::LabelControl("Selection: None", 12.0f);
+        _debugLabel->setForeColor(osg::Vec4f(0, 0, 0, 1));
+        //_debugLabel->setHaloColor(osg::Vec4f(1, 1, 1, 1));
+        _debugBox->addControl(_debugLabel.get());
+        _debugBox->setVertFill(true);
+        _debugBox->setForeColor(osg::Vec4f(0, 0, 0, 1));
+        _debugBox->setBackColor(osg::Vec4f(1, 1, 1, 0.6));
+        osgEarth::Util::Controls::ControlCanvas::getOrCreate(_viewer.get())->addControl(_debugBox.get());
+    }
     if (_copyrightScaleBox.valid())
         return;
@@ -606 +621 @@
             _mouseCoordsTool = NULL;
         }
-        if (_coordsCallback.valid() && _viewer.valid()) {
-            osgEarth::Util::Controls::LabelControl *readout =
-                _coordsCallback->getLabel();
-            osgEarth::Util::Controls::ControlCanvas::getOrCreate(_viewer.get())->removeControl(readout);
+        if (_coordsCallback.valid()) {
             _coordsCallback = NULL;
         }
+        if (_coordsBox.valid() && _viewer.valid()) {
+            _coordsBox->clearControls();
+            osgEarth::Util::Controls::ControlCanvas::getOrCreate(_viewer.get())->removeControl(_coordsBox.get());
+        }
+        _coordsBox = NULL;
     } else {
         initMouseCoordsTool(type, precision);
@@ -653 +670 @@
         _coordsCallback = NULL;
     } else {
-        readout = new osgEarth::Util::Controls::LabelControl("", 12.0f);
-        osgEarth::Util::Controls::ControlCanvas::getOrCreate(_viewer.get())->addControl(readout);
-        readout->setForeColor(osg::Vec4f(1, 1, 1, 1));
-        readout->setHaloColor(osg::Vec4f(0, 0, 0, 1));
+        readout = new osgEarth::Util::Controls::LabelControl("Lat/Long: N/A", 12.0f);
+        readout->setForeColor(osg::Vec4f(0, 0, 0, 1));
+        _coordsBox =
+            new osgEarth::Util::Controls::HBox(osgEarth::Util::Controls::Control::ALIGN_LEFT,
+                                               osgEarth::Util::Controls::Control::ALIGN_TOP,
+                                               osgEarth::Util::Controls::Gutter(0, 2, 2, 0), 2.0f);
+        _coordsBox->setVertFill(true);
+        _coordsBox->setForeColor(osg::Vec4f(0, 0, 0, 1));
+        _coordsBox->setBackColor(osg::Vec4f(1, 1, 1, 0.6));
+        _coordsBox->addControl(readout);
+        osgEarth::Util::Controls::ControlCanvas::getOrCreate(_viewer.get())->addControl(_coordsBox.get());
     }
 
@@ -1579 +1603 @@
 void Renderer::deselectFeatures(std::vector<unsigned long>& featureIDs, const char *layerName)
 {
+    // TODO: Take down placard?
     TRACE("Deselect features layer '%s', num features: %u", layerName, featureIDs.size());
     for (unsigned int i = 0; i < featureIDs.size(); i++) {
@@ -1592 +1617 @@
         TRACE("No selection");
     }
+    updateDebugLabel();
 }
 
@@ -1657 +1683 @@
         _needsRedraw = true;
     }
+    updateDebugLabel();
+}
+
+void Renderer::updateDebugLabel()
+{
+    if (!_debugLabel.valid()) return;
+    std::ostringstream oss;
+    oss << "Selection:";
+    for (FeatureSelectionHashmap::iterator itr = _selectedFeatures.begin();
+         itr != _selectedFeatures.end(); ++itr) {
+        bool found = false;
+        oss << std::endl << itr->first << ":";
+        for (FeatureSelectionHashmap::mapped_type::iterator fitr = itr->second.begin();
+             fitr != itr->second.end(); ++fitr) {
+            oss << " " << *fitr;
+            found = true;
+        }
+        if (!found) {
+            oss << " None";
+        }
+    }
+    _debugLabel->setText(oss.str());
 }
 
@@ -1682 +1730 @@
     clearSelectionAnnotationNodes();
     clearBoxSelection();
+    updateDebugLabel();
     _needsRedraw = true;
 }

geovis/trunk/Renderer.h

@@ -603 +603 @@
     void initControls();
 
+    void updateDebugLabel();
+
     void initEarthManipulator();
 
@@ -661 +663 @@
     osg::ref_ptr<ScreenCaptureCallback> _captureCallback;
     osg::ref_ptr<osgEarth::Util::AutoClipPlaneCullCallback> _clipPlaneCullCallback;
+    osg::ref_ptr<osgEarth::Util::Controls::HBox> _coordsBox;
     osg::ref_ptr<MouseCoordsTool> _mouseCoordsTool;
     osg::ref_ptr<MouseCoordsCallback> _coordsCallback;
+    osg::ref_ptr<osgEarth::Util::Controls::HBox> _debugBox;
+    osg::ref_ptr<osgEarth::Util::Controls::LabelControl> _debugLabel;
     osg::ref_ptr<osgEarth::Util::Controls::HBox> _copyrightScaleBox;
     osg::ref_ptr<osgEarth::Util::Controls::LabelControl> _copyrightLabel;