Changeset 5107 for geovis

Timestamp:

Mar 9, 2015 10:25:52 AM (9 years ago)

Author:

ldelgass

Message:

add colormap driver option

Location:

geovis/trunk

Files:

• RendererCmd.cpp (modified) (1 diff)
• geovis_protocol.txt (modified) (3 diffs)

geovis/trunk/RendererCmd.cpp

@@ -1019 +1019 @@
         if (driver[0] == 'c' && strcmp(driver, "colorramp") == 0) {
             osgEarth::Drivers::ColorRampOptions colorRampOpts;
-            osgEarth::Drivers::GDALOptions opts;
-            opts.url() = url;
-            char *profile = Tcl_GetString(objv[8]);
-            char *colormap = Tcl_GetString(objv[9]);
-            osgEarth::ElevationLayerOptions elevOpts(name, opts);
-            if (!cache) {
-                elevOpts.cachePolicy() = osgEarth::CachePolicy(osgEarth::CachePolicy::USAGE_NO_CACHE);
+            char *edriver = Tcl_GetString(objv[8]);
+            char *profile = Tcl_GetString(objv[9]);
+            char *colormap = Tcl_GetString(objv[10]);
+            if (edriver[0] == 'g' && strcmp(edriver, "gdal") == 0) {
+                osgEarth::Drivers::GDALOptions opts;
+                opts.url() = url;
+                osgEarth::ElevationLayerOptions elevOpts(name, opts);
+                if (!cache) {
+                    elevOpts.cachePolicy() = osgEarth::CachePolicy(osgEarth::CachePolicy::USAGE_NO_CACHE);
+                }
+                if (profile != NULL) {
+                    elevOpts.driver()->profile() = osgEarth::ProfileOptions(profile);
+                }
+                colorRampOpts.elevationLayer() = elevOpts;
+            } else if (edriver[0] == 't' && strcmp(edriver, "tms") == 0) {
+                osgEarth::Drivers::TMSOptions opts;
+                //char *tmsType = Tcl_GetString(objv[8]);
+                //char *format = Tcl_GetString(objv[9]);
+                opts.url() = url;
+                //opts.tmsType() = tmsType;
+                //opts.format() = format;
+                osgEarth::ElevationLayerOptions elevOpts(name, opts);
+                if (!cache) {
+                    elevOpts.cachePolicy() = osgEarth::CachePolicy(osgEarth::CachePolicy::USAGE_NO_CACHE);
+                }
+                if (profile != NULL) {
+                    elevOpts.driver()->profile() = osgEarth::ProfileOptions(profile);
+                }
+                colorRampOpts.elevationLayer() = elevOpts;
             }
-            if (profile != NULL) {
-                //elevOpts.driver()->profile()->srsString() = "epsg:4326";
-                elevOpts.driver()->profile() = osgEarth::ProfileOptions(profile);
-            }
-            colorRampOpts.elevationLayer() = elevOpts;
             colorRampOpts.ramp() = g_renderer->getColorMapFilePath(colormap);
             ret = g_renderer->addImageLayer(name, colorRampOpts, cache, shared, visible, minLOD, maxLOD);

geovis/trunk/geovis_protocol.txt

@@ -130 +130 @@
 
 General form:
-map layer add <type> <driver> <url> ... <layerName>
+map layer add <layerName> <type> <driver> <url> ...
     <type> = image|elevation|line|point|polygon|text
-    <driver> = gdal|tms|wms|xyz
+    <driver> = colorramp|debug|gdal|tms|wms|xyz
 
 Specific image layer types:
-map layer add image gdal <url> <cache> <layerName>
+map layer add <layerName> image colorramp <url> <cache> <elevdriver> <profile> <colormapName>
+    Add a colormapped image layer from a file or URL
+    <url> = URL of source
+    <cache> = bool indicating if tiles should be cached on disk
+    <elevdriver> = Elevation driver to read source
+    <profile> = profile of source
+    <colormapName> = Name of colormap
+map layer add <layerName> image gdal <url> <cache>
     Add a GDAL image layer from a file or URL
-map layer add image wms <url> <cache> <layers> <format> <transparent> <layerName>
+map layer add <layerName> image wms <url> <cache> <layers> <format> <transparent>
     Add a WMS image layer from a URL + layer string
     <url> = URL of WMS service
@@ -144 +151 @@
     <format> = Image format to return (e.g. 'png')
     <transparent> = bool
-map layer add image tms <url> <cache> <layerName>
+map layer add <layerName> image tms <url> <cache>
     Add a TMS image layer from a URL
     <url> = URL of TMS service
     <cache> = bool indicating if tiles should be cached on disk
-map layer add image xyz <urlPattern> <cache> <layerName>
+map layer add <layerName> image xyz <urlPattern> <cache>
     Add an image layer from a web map using a template URL
     <cache> = bool indicating if tiles should be cached on disk
 
 Elevation layers:
-map layer add elevation <driver> <url> <layerName>
+map layer add <layerName> elevation <driver> <url>
     Add an elevation image layer from a file or URL
     <driver> = gdal|tms|wms
 
 Feature/model layers:
-map layer add point <url> <r> <g> <b> <size> <layerName>
+map layer add <layerName> point <url> <r> <g> <b> <size>
     Add a point feature layer from a file or URL
-map layer add polygon <url> <r> <g> <b> <width> <layerName>
+map layer add <layerName> polygon <url> <r> <g> <b> <width>
     Add a polygon feature layer from a file or URL
-map layer add line <url> <r> <g> <b> <width> <layerName>
+map layer add <layerName> line <url> <r> <g> <b> <width>
     Add a line feature layer from a file or URL
-map layer add text <url> <layerName>
+map layer add <layerName> text <url> <content> <priority> <fgR> <fgG> <fgB> <bgR> <bgG> <bgB> <haloWidth> <fontSize> <removeDupes> <declutter> <visibilityRangeMin> <visibilityRangeMax>
     Add a text symbol layer from a file or URL
 
@@ -185 +192 @@
     <precision> = integer number of digits to display
 
-map reset <type> <?profile?> <?xmin?> <?ymin?> <?xmax?> <?ymax?>
+map reset <type> <r> <g> <b> <?profile?> <?xmin?> <?ymin?> <?xmax?> <?ymax?>
     Clear the scene and rebuild a new map from scratch.  When resetting the 
     map to geocentric, a profile and extents should be omitted.  When the map
     type is projected, the profile is required and extents are optional.
-    type = geocentric|projected
-    profile = Well known profile string, e.g. 'global-geodetic',
+    <type> = geocentric|projected
+    <r>,<g>,<b> - Background color red, green and blue components [0,1]
+    <profile> = Well known profile string, e.g. 'global-geodetic',
     'global-mercator'.  If specifying bounds (i.e. not global), use 'geodetic'
     or 'spherical-mercator' or an SRS init string (such as an EPSG code)