Changeset 5974 for geovis/trunk

Timestamp:

Jan 27, 2016 5:47:42 PM (8 years ago)

Author:

ldelgass

Message:

Use fill attribute of PolygonSymbol? in placard style for backing quad color.

Location:

geovis/trunk

Files:

• Placard.cpp (modified) (4 diffs)
• Placard.h (modified) (2 diffs)
• RendererCmd.cpp (modified) (3 diffs)
• geovis_protocol.txt (modified) (3 diffs)

geovis/trunk/Placard.cpp

@@ -25 +25 @@
 using namespace GeoVis;
 
-Placard::Placard() :
-    _backdropColor(0.75, 0.75, 0.75, 0.75)
+Placard::Placard()
 {
     osgEarth::Symbology::TextSymbol *ts = _textStyle.getOrCreateSymbol<osgEarth::Symbology::TextSymbol>();
@@ -37 +36 @@
     //ts->encoding() = osgEarth::Symbology::TextSymbol::ENCODING_UTF8;
     double charSize = ts->size().isSet() ? ts->size()->eval() : 14.0;
+
+    // Set backdrop quad color as PolygonSymbol fill
+    osgEarth::Symbology::PolygonSymbol *ps = _textStyle.getOrCreateSymbol<osgEarth::Symbology::PolygonSymbol>();
+    ps->fill() = osgEarth::Symbology::Color(0.75, 0.75, 0.75, 0.75);
+
     _padding = (float)(charSize / 2.0);
 }
@@ -189 +193 @@
         _backdropGeode->removeDrawables( 0, _backdropGeode->getNumDrawables() );
         const osgEarth::Symbology::PolygonSymbol* gs = _style.get<osgEarth::Symbology::PolygonSymbol>();
-        osg::Vec4 color(_placardConf.getBackdropColor());
+        osg::Vec4 color(0.75, 0.75, 0.75, 0.75);
         if (gs && gs->fill().isSet()) {
             color = gs->fill().get().color();
@@ -227 +231 @@
 
     const osgEarth::Symbology::PolygonSymbol* gs = _style.get<osgEarth::Symbology::PolygonSymbol>();
-    osg::Vec4 color(_placardConf.getBackdropColor());
+    osg::Vec4 color(0.75, 0.75, 0.75, 0.75);
     if (gs && gs->fill().isSet()) {
         color = gs->fill().get().color();

geovis/trunk/Placard.h

@@ -68 +68 @@
         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;
 };
@@ -169 +161 @@
     osg::ref_ptr<osg::Geode>   _geode;
     osg::ref_ptr<osg::Geode>   _backdropGeode;
-    osg::Vec4 _backdropColor;
 
     Placard _placardConf;

geovis/trunk/RendererCmd.cpp

@@ -3043 +3043 @@
     int namec;
     Tcl_Obj **namev = NULL;
-    const char *layerName = Tcl_GetString(objv[9]);
+    const char *layerName = Tcl_GetString(objv[5]);
 
     if (Tcl_ListObjGetElements(interp, objv[2], &namec, &namev) != TCL_OK) {
@@ -3062 +3062 @@
     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) {
+    if (GetFloatFromObj(interp, objv[4], &padding) != TCL_OK) {
         return TCL_ERROR;
     }
@@ -3080 +3073 @@
 
 static CmdSpec placardOps[] = {
-    {"config", 1, PlacardConfigOp, 10, 10, "attrlist textStyle bgColorR bgColorG bgColorB bgColorA padding layerName"},
+    {"config", 1, PlacardConfigOp, 6, 6, "attrlist style padding layerName"},
 };
 static int nPlacardOps = NumCmdSpecs(placardOps);

geovis/trunk/geovis_protocol.txt

@@ -133 +133 @@
 == Interaction Configuration ==
 
-placard config <attrlist> <textStyle> <bgR> <bgG> <bgB> <bgA> <padding> <layerName>
-    <attrlist> - List of attributes.  The list should consist of alternating attribute names and attribute labels.  The names are the column names of the attributes in the feature data and the corresponding labels will be displayed on the info placard
-    <textStyle> - CSS style attributes for TextSymbol
-    <bgR>,<bgG>,<bgB>,<bgA> - RGBA color (floats [0,1]) for backdrop quad.
+placard config <attrlist> <style> <padding> <layerName>
+    <attrlist> - List of attributes.  The list should consist of alternating
+    attribute names and attribute labels.  The names are the column names of the
+    attributes in the feature data and the corresponding labels will be 
+    displayed on the info placard
+    <style> - CSS style attributes for TextSymbol and PolygonSymbol (fill for
+    backing quad)
     <padding> - Pixels of padding between text and edge of backdrop quad.
     <layerName> - The name of the layer containing the feature data.
@@ -219 +222 @@
 In the following:
 <driver> = db|ogr|tfs|wfs
-<url> = file/web service address, or for driver 'db' the postgis connection string
+<url> = file/web service address, or for driver 'db' the postgis connection
+string
 <format> = json|gml (for tfs or wfs driver)
 <typeName> = layer name for db or wfs driver
@@ -226 +230 @@
 
 map layer add <layerName> feature <driver> <format> <typeName> <url> <cache> <style> <?scripts?> <?selectors?> <?visibilityRangeMin?> <?visibilityRangeMax?>
-    <style> = CSS styles (see http://docs.osgearth.org/en/latest/user/features.html and http://docs.osgearth.org/en/latest/references/symbology.html)
+    <style> = CSS styles (see:
+    http://docs.osgearth.org/en/latest/user/features.html and
+    http://docs.osgearth.org/en/latest/references/symbology.html)
     <scripts> = JavaScript (see references above)
     <selectors> = List of name/value pairs