Changeset 6005 for geovis

Timestamp:

Feb 11, 2016 11:57:17 PM (8 years ago)

Author:

ldelgass

Message:

Add ability to post placard on select feature command (currently disabled).

Location:

geovis/trunk

Files:

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

geovis/trunk/Picker.cpp

@@ -202 +202 @@
 
         _renderer->clearSelection();
-
-        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);
-        label->getOrCreateStateSet()->setRenderBinDetails(INT_MAX, "RenderBin");
-        _renderer->getAnnotations()->addChild(label);
+        _renderer->addPlacard(_pickPoint, feature, layerName.c_str());
 
         char mesg[256];

geovis/trunk/Renderer.cpp

@@ -1566 +1566 @@
 #if OSGEARTH_MIN_VERSION_REQUIRED(3, 0, 0)
             osgEarth::ObjectID id = index->getObjectID(fid);
+#if 0
+            osgEarth::Features::Feature *feature = index->getFeature(id);
+            if (feature) {
+                // Find feature centroid
+                osgEarth::GeoPoint location;
+                if (feature->getGeometry()) {
+                    osg::BoundingSphered bound;
+                    feature->getWorldBound(getMapSRS(), bound);
+                    location.set(getMapSRS(), bound.center(),
+                                 osgEarth::ALTMODE_ABSOLUTE);
+                }
+                addPlacard(location, feature, layerName);
+            }
+#endif
             setHighlightByObjectID(id);
             TRACE("FID %lu = OID %d", fid, id);
@@ -1572 +1586 @@
         _needsRedraw = true;
     }
+}
+
+void Renderer::addPlacard(const osgEarth::GeoPoint& location,
+                          osgEarth::Features::Feature *feature,
+                          const char *layerName)
+{
+    if (feature == NULL) return;
+
+    const osgEarth::Features::AttributeTable &attrs = feature->getAttrs();
+    Placard placard = getPlacardConfig(layerName);
+    if (placard.getNumEntries() == 0) {
+        placard.addAllAttributes(attrs);
+    }
+    PlacardNode *label = 
+        new PlacardNode(_mapNode.get(), location, placard, attrs);
+    label->getOrCreateStateSet()->setRenderBinDetails(INT_MAX, "RenderBin");
+    getAnnotations()->addChild(label);
 }
 

geovis/trunk/Renderer.h

@@ -519 +519 @@
     void selectFeatures(std::vector<unsigned long>& featureIDs, const char *layerName);
 
+    void addPlacard(const osgEarth::GeoPoint& location,
+                    osgEarth::Features::Feature *feature,
+                    const char *layerName);
+
     void clearSelection();
 
@@ -555 +559 @@
         return _placeNodes.get();
     }
-    Placard getPlacardConfig(const std::string& layerName)
+    Placard getPlacardConfig(const char *layerName)
     {
         Placard ret;