Changeset 6254 for geovis

Timestamp:

Apr 7, 2016, 12:01:13 PM (9 years ago)

Author:

ldelgass

Message:

Implement enable/disable placard.

Location:

geovis/trunk

Files:

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

geovis/trunk/Placard.cpp

@@ -26 +26 @@
 using namespace GeoVis;
 
-Placard::Placard()
+Placard::Placard() :
+    _enabled(true)
 {
     osgEarth::Symbology::TextSymbol *ts = _textStyle.getOrCreateSymbol<osgEarth::Symbology::TextSymbol>();

geovis/trunk/Placard.h

@@ -72 +72 @@
         return _padding;
     }
+    bool enabled()
+    {
+        return _enabled;
+    }
+    void setEnabled(bool state)
+    {
+        _enabled = state;
+    }
 
 private:
@@ -78 +86 @@
     float _padding;
     osgEarth::Symbology::Style _textStyle;
+    bool _enabled;
 };
 

geovis/trunk/Renderer.cpp

@@ -1589 +1589 @@
 }
 
+void Renderer::enablePlacard(const char *layerName, bool state)
+{
+    osgEarth::ModelLayer *layer = _map->getModelLayerByName(layerName);
+    if (layer == NULL) {
+        ERROR("Unknown layer '%s'", layerName);
+        return;
+    }
+    _placardConfigs[layerName].setEnabled(state);
+}
+
 void Renderer::setPlacardConfig(const Placard& placardConf, const char *layerName)
 {
@@ -1712 +1722 @@
 {
     if (feature == NULL) return;
+    Placard placard = getPlacardConfig(layerName);
+    if (!placard.enabled())
+        return;
 
     const osgEarth::Features::AttributeTable &attrs = feature->getAttrs();
-    Placard placard = getPlacardConfig(layerName);
     if (placard.getNumEntries() == 0) {
         placard.addAllAttributes(attrs);

geovis/trunk/Renderer.h

@@ -525 +525 @@
 
     void writeScene(const std::string& file);
+
+    void enablePlacard(const char *layerName, bool state);
 
     void setPlacardConfig(const Placard& placardConf, const char *layerName);

geovis/trunk/RendererCmd.cpp

@@ -3272 +3272 @@
         return TCL_ERROR;
     }
-    //g_renderer->enablePlacard(layerName, enable);
+    g_renderer->enablePlacard(layerName, enable);
     return TCL_OK;
 }