Changeset 6247 for geovis/trunk

Timestamp:

Apr 5, 2016 1:23:12 PM (8 years ago)

Author:

ldelgass

Message:

use flag instead of ifdef

File:

• geovis/trunk/Renderer.cpp (modified) (2 diffs)

geovis/trunk/Renderer.cpp

@@ -1596 +1596 @@
 void Renderer::selectFeatures(std::vector<unsigned long>& featureIDs, const char *layerName, bool clear)
 {
+    bool doPlacard = true;
     TRACE("Select layer '%s', num features: %u", layerName, featureIDs.size());
     if (clear) {
@@ -1637 +1638 @@
 #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);
+            if (doPlacard) {
+                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);
                 }
-                addPlacard(location, feature, layerName);
             }
-#endif
             setHighlightByObjectID(id);
             TRACE("FID %lu = OID %d", fid, id);