Changeset 4299 for trunk

Timestamp:

Mar 29, 2014 4:37:56 AM (10 years ago)

Author:

ldelgass

Message:

Add options for setting source of label content and priority in text layers:
these are expressions used to select data from a .dbf file

File:

• trunk/packages/vizservers/geovis/RendererCmd.cpp (modified) (2 diffs)

trunk/packages/vizservers/geovis/RendererCmd.cpp

@@ -648 +648 @@
         osgEarth::Drivers::OGRFeatureOptions opts;
         char *url =  Tcl_GetString(objv[4]);
-        char *name = Tcl_GetString(objv[5]);
+        char *content = Tcl_GetString(objv[5]);
+        char *priority = Tcl_GetString(objv[6]);
+        char *name = Tcl_GetString(objv[7]);
         opts.url() = url;
 
@@ -656 +658 @@
         ts->halo()->width() = 2.0f;
         ts->fill()->color() = osgEarth::Symbology::Color::Black;
+        ts->content() = osgEarth::Symbology::StringExpression(content);
+        ts->priority() = osgEarth::Symbology::NumericExpression(priority);
+        ts->removeDuplicateLabels() = true;
+        ts->size() = 16.0f;
+        ts->alignment() = osgEarth::Symbology::TextSymbol::ALIGN_CENTER_CENTER;
+        ts->declutter() = true;
 
         osgEarth::Symbology::RenderSymbol* rs = style.getOrCreateSymbol<osgEarth::Symbology::RenderSymbol>();