Changeset 6350 for geovis

Timestamp:

May 17, 2016 1:53:55 AM (8 years ago)

Author:

ldelgass

Message:

Update protocol for agglite rasterizing driver to match feature layer.

Location:

geovis/trunk

Files:

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

geovis/trunk/RendererCmd.cpp

@@ -1416 +1416 @@
             const char *typeName = Tcl_GetString(objv[11]);
 
-            osgEarth::Config styleConf("style", Tcl_GetString(objv[12]));
+            long ssSize;
+            if (Tcl_GetLongFromObj(interp, objv[12], &ssSize) != TCL_OK) {
+                return TCL_ERROR;
+            }
+            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());
@@ -1427 +1437 @@
 
             if (objc > 13) {
-                std::string scripts(Tcl_GetString(objv[13]));
+                long scriptSize;
+                if (Tcl_GetLongFromObj(interp, objv[13], &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());
@@ -1438 +1461 @@
             }
             if (objc > 14) {
+                long selectorsSize;
+                if (Tcl_GetLongFromObj(interp, objv[14], &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[14], &numSelectors, &selectors) != TCL_OK) {
+                if (Tcl_ListObjGetElements(interp, selectorsObj, &numSelectors, &selectors) != TCL_OK) {
                     return TCL_ERROR;
                 }
@@ -1493 +1526 @@
                     aggOpts.styles()->selectors().push_back(ss);
                 }
+                Tcl_DecrRefCount(selectorsObj);
             }
             if (featureDriver[0] == 'd' && strcmp(featureDriver, "db") == 0) {

geovis/trunk/geovis_protocol.txt

@@ -192 +192 @@
 
 Specific image layer types:
-map layer add <layerName> image agglite <url> <cache> <coverage> <featuredriver> <format> <typeName> <style> <?scripts?> <?selectors?>
+map layer add <layerName> image agglite <url> <cache> <coverage> <featuredriver> <format> <typeName> <styleLen> <?scriptLen?> <?selectorsLen?>
     Rasterize a feature source to an image layer using the AGGLite renderer
     <url> = URL of source
@@ -201 +201 @@
     <format> = See Feature/model layers below
     <typeName> = See Feature/model layers below
-    <style> = See Feature/model layers below
-    <scripts> = See Feature/model layers below
-    <selectors> = See Feature/model layers below
+    <styleLen> = See Feature/model layers below
+    <scriptLen> = See Feature/model layers below
+    <selectorsLen> = See Feature/model layers below
 map layer add <layerName> image colorramp <url> <cache> <coverage> <elevdriver> <profile> <colormapName>
     Add a colormapped image layer from a file or URL