Changeset 5969 for geovis/trunk

Timestamp:

Jan 25, 2016 6:28:49 PM (8 years ago)

Author:

ldelgass

Message:

Add style settings for placard

Location:

geovis/trunk

Files:

• Picker.cpp (modified) (2 diffs)
• Placard.cpp (modified) (5 diffs)
• Placard.h (modified) (4 diffs)
• RendererCmd.cpp (modified) (3 diffs)

geovis/trunk/Picker.cpp

@@ -201 +201 @@
         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>();
-        //ts->halo()->color() = osgEarth::Symbology::Color(1, 1, 1);
-        //ts->halo()->width() = 2;
-        ts->fill()->color() = osgEarth::Symbology::Color(0, 0, 0);
-        ts->size() = 14;
-        //ts->alignment() = alignment;
-        ts->declutter() = false;
-        //ts->encoding() = osgEarth::Symbology::TextSymbol::ENCODING_UTF8;
         clearSelection();
 
@@ -218 +209 @@
         }
         PlacardNode *label = 
-            new PlacardNode(_renderer->getMapNode(), _pickPoint, placard, attrs, style);
+            new PlacardNode(_renderer->getMapNode(), _pickPoint, placard, attrs);
         label->getOrCreateStateSet()->setRenderBinDetails(INT_MAX, "RenderBin");
         _renderer->getAnnotations()->addChild(label);

geovis/trunk/Placard.cpp

@@ -22 +22 @@
 using namespace GeoVis;
 
+Placard::Placard() :
+    _backdropColor(0.75, 0.75, 0.75, 0.75)
+{
+    osgEarth::Symbology::TextSymbol *ts = _textStyle.getOrCreateSymbol<osgEarth::Symbology::TextSymbol>();
+    //ts->halo()->color() = osgEarth::Symbology::Color(1, 1, 1);
+    //ts->halo()->width() = 2;
+    ts->fill()->color() = osgEarth::Symbology::Color(0, 0, 0);
+    ts->size() = 14;
+    //ts->alignment() = alignment;
+    ts->declutter() = false;
+    //ts->encoding() = osgEarth::Symbology::TextSymbol::ENCODING_UTF8;
+    double charSize = ts->size().isSet() ? ts->size()->eval() : 14.0;
+    _padding = (float)(charSize / 2.0);
+}
+
 PlacardLabelNode::PlacardLabelNode(osgEarth::MapNode *mapNode,
                                    const osgEarth::GeoPoint& position,
                                    const Placard& placardConf,
-                                   const osgEarth::Features::AttributeTable &attrs,
-                                   const osgEarth::Symbology::Style& style) :
-    osgEarth::Annotation::LabelNode(mapNode, position, style),
+                                   const osgEarth::Features::AttributeTable &attrs) :
+    osgEarth::Annotation::LabelNode(mapNode, position, placardConf.getStyle()),
     _placardConf(placardConf),
     _attrs(attrs)
@@ -74 +88 @@
                          const osgEarth::GeoPoint& position,
                          const Placard& placardConf,
-                         const osgEarth::Features::AttributeTable &attrs,
-                         const osgEarth::Symbology::Style& style) :
+                         const osgEarth::Features::AttributeTable &attrs) :
     osgEarth::Annotation::OrthoNode(mapNode, position),
-    _backdropColor(0.75, 0.75, 0.75, 0.75),
     _placardConf(placardConf),
     _attrs(attrs)
 {
     setConfig(placardConf);
-    init(style);
+    init(placardConf.getStyle());
 }
 
@@ -172 +184 @@
     if (bd) {
         osg::BoundingBox bbox = d->getBoundingBox();
-        const osgEarth::Symbology::TextSymbol* symbol = _style.get<osgEarth::Symbology::TextSymbol>();
-        double charSize = symbol && symbol->size().isSet() ? symbol->size()->eval() : 16.0;
-        float padding = (float)(charSize / 2.0);
         _backdropGeode->removeDrawables( 0, _backdropGeode->getNumDrawables() );
-        osg::Drawable *bd = osgEarth::Annotation::AnnotationUtils::create2DQuad(bbox, padding, _backdropColor);
+        osg::Drawable *bd = osgEarth::Annotation::AnnotationUtils::create2DQuad(bbox, _placardConf.getPadding(), _placardConf.getBackdropColor());
         _backdropGeode->addDrawable(bd);
     }
@@ -207 +216 @@
     _geode->setCullingActive(false);
 
-    double charSize = symbol && symbol->size().isSet() ? symbol->size()->eval() : 16.0;
     osg::BoundingBox bbox = t->getBoundingBox();
-    float padding = (float)(charSize / 2.0);
-    osg::Drawable *bd = osgEarth::Annotation::AnnotationUtils::create2DQuad(bbox, padding, _backdropColor);
+    
+    osg::Drawable *bd = osgEarth::Annotation::AnnotationUtils::create2DQuad(bbox, _placardConf.getPadding(), _placardConf.getBackdropColor());
     _backdropGeode->addDrawable(bd);
     _backdropGeode->setCullingActive(false);
@@ -258 +266 @@
     conf.add   ( "text",   _text );
     conf.addObj( "style",  _style );
+    conf.add   ( "padding", _placardConf.getPadding() );
+    conf.add   ( "bg-fill", _placardConf.getBackdropColor() );
     conf.addObj( "position", getPosition() );
 

geovis/trunk/Placard.h

@@ -22 +22 @@
 class Placard {
 public:
-    Placard()
-    {}
+    Placard();
     virtual ~Placard()
     {}
@@ -53 +52 @@
         return _attrNames.size();
     }
+    void setStyle(const osgEarth::Symbology::Style& style)
+    {
+        _textStyle = style;
+    }
+    const osgEarth::Symbology::Style& getStyle() const
+    {
+        return _textStyle;
+    }
+    void setPadding(float padding)
+    {
+        _padding = padding;
+    }
+    float getPadding() const
+    {
+        return _padding;
+    }
+    void setBackdropColor(const osg::Vec4& color)
+    {
+        _backdropColor = color;
+    }
+    const osg::Vec4& getBackdropColor() const
+    {
+        return _backdropColor;
+    }
 private:
     std::vector<std::string> _attrNames;
     std::vector<std::string> _attrLabels;
+    float _padding;
+    osg::Vec4 _backdropColor;
+    osgEarth::Symbology::Style _textStyle;
 };
 
@@ -75 +101 @@
                      const osgEarth::GeoPoint& position,
                      const Placard& placardConf,
-                const osgEarth::Features::AttributeTable &attrs,
-                     const osgEarth::Symbology::Style& style = osgEarth::Symbology::Style());
+                     const osgEarth::Features::AttributeTable &attrs);
 
     virtual ~PlacardLabelNode()
@@ -105 +130 @@
                 const osgEarth::GeoPoint& position,
                 const Placard& placardConf,
-                const osgEarth::Features::AttributeTable &attrs,
-                const osgEarth::Symbology::Style& style = osgEarth::Symbology::Style());
+                const osgEarth::Features::AttributeTable &attrs);
 
     virtual ~PlacardNode()

geovis/trunk/RendererCmd.cpp

@@ -3043 +3043 @@
     int namec;
     Tcl_Obj **namev = NULL;
-    const char *layerName = Tcl_GetString(objv[3]);
+    const char *layerName = Tcl_GetString(objv[9]);
 
     if (Tcl_ListObjGetElements(interp, objv[2], &namec, &namev) != TCL_OK) {
@@ -3059 +3059 @@
         placardConf.addEntry(name, label);
     }
+    osgEarth::Config styleConf("style", Tcl_GetString(objv[3]));
+    styleConf.add("type", "text/css");
+    placardConf.setStyle(osgEarth::Symbology::Style(styleConf));
+    float r, g, b, a;
+    if (GetFloatFromObj(interp, objv[4], &r) != TCL_OK ||
+        GetFloatFromObj(interp, objv[5], &g) != TCL_OK ||
+        GetFloatFromObj(interp, objv[6], &b) != TCL_OK ||
+        GetFloatFromObj(interp, objv[7], &a) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    placardConf.setBackdropColor(osg::Vec4(r, g, b, a));
+    float padding;
+    if (GetFloatFromObj(interp, objv[8], &padding) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    placardConf.setPadding(padding);
     g_renderer->setPlacardConfig(placardConf, layerName);
     return TCL_OK;
@@ -3064 +3080 @@
 
 static CmdSpec placardOps[] = {
-    {"config", 1, PlacardConfigOp, 4, 4, "attrlist layerName"},
+    {"config", 1, PlacardConfigOp, 10, 10, "attrlist textStyle bgColorR bgColorG bgColorB bgColorA padding layerName"},
 };
 static int nPlacardOps = NumCmdSpecs(placardOps);