Changeset 5944 for geovis/trunk/Picker.cpp

Timestamp:

Dec 11, 2015, 12:21:12 AM (9 years ago)

Author:

ldelgass

Message:

Add command to configure attributes to display in feature info placard.

File:

• geovis/trunk/Picker.cpp (modified) (3 diffs)

geovis/trunk/Picker.cpp

@@ -22 +22 @@
 
 #include "Picker.h"
+#include "Placard.h"
 #include "Renderer.h"
 #include "RendererCmd.h"
@@ -188 +189 @@
     osgEarth::Features::FeatureIndex *index = osgEarth::Registry::objectIndex()->get<osgEarth::Features::FeatureIndex>(id);
     osgEarth::Features::Feature *feature = index ? index->getFeature(id) : 0L;
-    INFO("Select hit oid: %lu", id);
+    INFO("Select hit oid: %lu at %g,%g", id, _pickPoint.x(), _pickPoint.y());
     if (feature) {
-        INFO("Hit feature ID: %lu (of %d)", feature->getFID(), index->size());
-        const osgEarth::Features::AttributeTable &attrs = feature->getAttrs();
-        std::ostringstream oss;
-        for (osgEarth::Features::AttributeTable::const_iterator itr = attrs.begin(); itr != attrs.end(); ++itr) {
-            INFO(" attr: %s", itr->first.c_str());
-            oss << itr->first.c_str() << ": ";
-            switch (itr->second.first) {
-            case osgEarth::Features::ATTRTYPE_STRING:
-                INFO(" value: %s", itr->second.getString().c_str());
-                oss << itr->second.getString() << std::endl;
-                break;
-            case osgEarth::Features::ATTRTYPE_INT:
-                INFO(" value: %d", itr->second.getInt());
-                oss << itr->second.getInt() << std::endl;
-                break;
-            case osgEarth::Features::ATTRTYPE_DOUBLE:
-                INFO(" value: %g", itr->second.getDouble());
-                oss << itr->second.getDouble() << std::endl;
-                break;
-            case osgEarth::Features::ATTRTYPE_BOOL:
-                INFO(" value: %s", itr->second.getBool() ? "true" : "false");
-                oss << (itr->second.getBool() ? "true" : "false") << std::endl;
-                break;
-            default:
-                INFO(" value: unknown type");
+        osgEarth::Features::FeatureSourceIndex *fsi = dynamic_cast<osgEarth::Features::FeatureSourceIndex *>(index);
+        std::string layerName;
+        if (fsi) {
+            osgEarth::Features::FeatureSource *source = fsi->getFeatureSource();
+            if (source) {
+                layerName = source->getFeatureSourceOptions().name().get();
             }
         }
-        INFO("Point: %g %g", _pickPoint.x(), _pickPoint.y());
-        //INFO("Label: %s", oss.str().c_str());
+        INFO("Hit feature ID: %lu (of %d) layer: %s", feature->getFID(), index->size(), layerName.c_str());
+
         osgEarth::Symbology::Style style;
         osgEarth::Symbology::TextSymbol *ts = style.getOrCreateSymbol<osgEarth::Symbology::TextSymbol>();
@@ -229 +211 @@
         //ts->encoding() = osgEarth::Symbology::TextSymbol::ENCODING_UTF8;
         clearSelection();
-        osgEarth::Annotation::LabelNode *label = 
-            new osgEarth::Annotation::LabelNode(_renderer->getMapNode(), _pickPoint, oss.str(), style);
+
+        const osgEarth::Features::AttributeTable &attrs = feature->getAttrs();
+        Placard placard = _renderer->getPlacardConfig(layerName);
+        if (placard.getNumEntries() == 0) {
+            placard.addAllAttributes(attrs);
+        }
+        PlacardNode *label = 
+            new PlacardNode(_renderer->getMapNode(), _pickPoint, placard, attrs, style);
         label->getOrCreateStateSet()->setRenderBinDetails(INT_MAX, "RenderBin");
         _renderer->getAnnotations()->addChild(label);
+
         char mesg[256];
-        std::string layerName;
-        osgEarth::Features::FeatureSourceIndex *fsi = dynamic_cast<osgEarth::Features::FeatureSourceIndex *>(index);
-        if (fsi) {
-            osgEarth::Features::FeatureSource *source = fsi->getFeatureSource();
-            if (source) {
-                layerName = source->getFeatureSourceOptions().name().get();
-            }
-        }
         snprintf(mesg, sizeof(mesg), "nv>select feature %u %lu %d {%s}\n", id, feature->getFID(), index->size(), layerName.c_str());
         size_t length = strlen(mesg);