Changeset 5151

Timestamp:

Mar 18, 2015 7:59:09 AM (9 years ago)

Author:

ldelgass

Message:

Delete colormap files in ~Renderer

Location:

geovis/trunk

Files:

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

geovis/trunk/Renderer.cpp

@@ -143 +143 @@
     TRACE("Enter");
 
+    // Removes temp files
+    deleteColorMap("all");
+
     // Cache is deleted in main() to allow ref-counted objects to
     // be deleted and threads to exit first
@@ -258 +261 @@
 
     do {
-        if (itr->first.compare("default") == 0 ||
-            itr->first.compare("grayDefault") == 0) {
-            if (id.compare("all") != 0) {
-                WARN("Cannot delete a default color map");
-            }
-            continue;
-        }
-
         TRACE("Deleting ColorMap %s", itr->first.c_str());
+        std::string path = getColorMapFilePath(itr->first);
+        if (remove(path.c_str()) < 0) {
+            ERROR("Failed to delete colormap file '%s': %s",
+                  path.c_str(), strerror(errno));
+        }
         itr = _colorMaps.erase(itr);
     } while (doAll && itr != _colorMaps.end());

geovis/trunk/RendererCmd.cpp

@@ -578 +578 @@
     if (objc == 3) {
         const char *name = Tcl_GetString(objv[2]);
+#if 0
+        if (strcmp(name, "default") == 0 ||
+            strcmp(name, "grayDefault") == 0) {
+            WARN("Cannot delete a default color map");
+            return TCL_ERROR;
+        }
+#endif
         g_renderer->deleteColorMap(name);
     } else {

geovis/trunk/geovis_protocol.txt

@@ -154 +154 @@
     Add a WMS image layer from a URL + layer string
     <url> = URL of WMS service
-    <cache> = bool indicating if tiles should be cached on disk
+    <cache> = bool indicating if tiles may be cached on disk
     <layers> = layers string for WMS server
     <format> = Image format to return (e.g. 'png')