Changeset 6347 for geovis

Timestamp:

May 17, 2016 12:43:56 AM (8 years ago)

Author:

ldelgass

Message:

Move stylesheet, script, selector definition to data payload in protocol for
adding feature layers.

Location:

geovis/trunk

Files:

• RenderServer.h (modified) (1 diff)
• RendererCmd.cpp (modified) (5 diffs)
• geovis_protocol.txt (modified) (1 diff)

geovis/trunk/RenderServer.h

@@ -21 +21 @@
 class Stats;
 
-#define GEOVIS_VERSION_STRING "0.7.2"
+#define GEOVIS_VERSION_STRING "0.7.3"
 
 #define MSECS_ELAPSED(t1, t2) \

geovis/trunk/RendererCmd.cpp

@@ -93 +93 @@
 SocketRead(char *bytes, size_t len)
 {
+    if (len == 0) return true;
     ReadBuffer::BufferStatus status;
     status = g_inBufPtr->followingData((unsigned char *)bytes, len);
@@ -1705 +1706 @@
         }
 
+        long ssSize;
+        if (Tcl_GetLongFromObj(interp, objv[10], &ssSize) != TCL_OK) {
+            return TCL_ERROR;
+        }
+
         bool lighting = true;
         osgEarth::Drivers::FeatureGeomModelOptions geomOpts;
-        osgEarth::Config styleConf("style", Tcl_GetString(objv[10]));
+        char *styleSheetStr = (char *)malloc((size_t)ssSize);
+        if (!SocketRead(styleSheetStr, ssSize)) {
+            free(styleSheetStr);
+            return TCL_ERROR;
+        }
+        osgEarth::Config styleConf("style", styleSheetStr);
+        free(styleSheetStr);
         styleConf.add("type", "text/css");
         TRACE("style CSS: %s", styleConf.value().c_str());
@@ -1761 +1773 @@
 
         if (objc > 11) {
-            std::string scripts(Tcl_GetString(objv[11]));
+            long scriptSize;
+            if (Tcl_GetLongFromObj(interp, objv[11], &scriptSize) != TCL_OK) {
+                return TCL_ERROR;
+            }
+            char *scriptStr = NULL;
+            if (scriptSize > 0) {
+                scriptStr = (char *)malloc((size_t)scriptSize);
+                if (!SocketRead(scriptStr, scriptSize)) {
+                    free(scriptStr);
+                    return TCL_ERROR;
+                }
+            }
+            std::string scripts(scriptStr, scriptSize);
+            free(scriptStr);
             if (!scripts.empty()) {
                 TRACE("script: %s", scripts.c_str());
@@ -1772 +1797 @@
         }
         if (objc > 12) {
+            long selectorsSize;
+            if (Tcl_GetLongFromObj(interp, objv[12], &selectorsSize) != TCL_OK) {
+                return TCL_ERROR;
+            }
+            char *selectorsStr = (char *)malloc((size_t)selectorsSize);
+            if (!SocketRead(selectorsStr, selectorsSize)) {
+                free(selectorsStr);
+                return TCL_ERROR;
+            }
+            Tcl_Obj *selectorsObj = Tcl_NewStringObj(selectorsStr, selectorsSize);
             int numSelectors;
             Tcl_Obj **selectors;
-            if (Tcl_ListObjGetElements(interp, objv[12], &numSelectors, &selectors) != TCL_OK) {
+            if (Tcl_ListObjGetElements(interp, selectorObj, &numSelectors, &selectors) != TCL_OK) {
                 return TCL_ERROR;
             }
@@ -1828 +1863 @@
                 geomOpts.styles()->selectors().push_back(ss);
             }
+            Tcl_DecrRefCount(selectorsObj);
         }
         geomOpts.enableLighting() = lighting;

geovis/trunk/geovis_protocol.txt

@@ -266 +266 @@
 <clamptechnique> = drape|gpu|scene|map
 
-map layer add <layerName> feature <driver> <format> <typeName> <url> <cache> <style> <?scripts?> <?selectors?> <?visibilityRangeMin?> <?visibilityRangeMax?>
-    <style> = CSS styles (see:
+map layer add <layerName> feature <driver> <format> <typeName> <url> <cache> <styleLen> <?scriptLen?> <?selectorsLen?> <?visibilityRangeMin?> <?visibilityRangeMax?>
+    Data payload follows command: style, then script, then selectors
+    <styleLen> = Number of bytes in style sheet. Stylesheet payload consists of 
+    CSS-formatted 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
+    <scriptLen> = Number of bytes in scripts.  Scripts payload consists of
+    JavaScript code (see references above)
+    <selectorsLen> = Number of bytes in selectors.  Selectors payload consists
+    of a Tcl list of name/value pairs
 map layer add <layerName> icon <driver> <format> <typeName> <url> <cache> <icon> <scale> <heading> <declutter> <placement> <alignment> <?visibilityRangeMin?> <?visibilityRangeMax?>
     Add an icon feature layer from a file or URL