Changeset 6019

Timestamp:

Feb 16, 2016 2:00:54 AM (7 years ago)

Author:

ldelgass

Message:

Make layer name really optional in 'map layer visible...'

File:

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

geovis/trunk/RendererCmd.cpp

@@ -2493 +2493 @@
         return TCL_ERROR;
     }
-    char *name = Tcl_GetString(objv[4]);
-
-    g_renderer->setImageLayerVisibility(name, visible);
-    g_renderer->setElevationLayerVisibility(name, visible);
-    g_renderer->setModelLayerVisibility(name, visible);
+
+    if (objc > 4) {
+        char *name = Tcl_GetString(objv[4]);
+        g_renderer->setImageLayerVisibility(name, visible);
+        g_renderer->setElevationLayerVisibility(name, visible);
+        g_renderer->setModelLayerVisibility(name, visible);
+    } else {
+        std::vector<std::string> layers;
+        g_renderer->getImageLayerNames(layers);
+        g_renderer->getElevationLayerNames(layers);
+        g_renderer->getModelLayerNames(layers);
+        for (std::vector<std::string>::iterator itr = layers.begin();
+             itr != layers.end(); ++itr) {
+            g_renderer->setImageLayerVisibility(itr->c_str(), visible);
+            g_renderer->setElevationLayerVisibility(itr->c_str(), visible);
+            g_renderer->setModelLayerVisibility(itr->c_str(), visible);
+        }
+    }
 
     return TCL_OK;
@@ -2507 +2520 @@
     {"move",    1, MapLayerMoveOp,      5, 5, "pos name"},
     {"names",   1, MapLayerNamesOp,     3, 4, "?type?"},
-    {"opacity", 1, MapLayerOpacityOp,   5, 5, "opacity ?name?"},
-    {"visible", 1, MapLayerVisibleOp,   5, 5, "bool ?name?"},
+    {"opacity", 1, MapLayerOpacityOp,   5, 5, "opacity name"},
+    {"visible", 1, MapLayerVisibleOp,   4, 5, "bool ?name?"},
 };
 static int nMapLayerOps = NumCmdSpecs(mapLayerOps);