Changeset 6138

Timestamp:

Mar 19, 2016 3:43:41 PM (8 years ago)

Author:

ldelgass

Message:

add validation for Map::setStyle

File:

• trunk/gui/scripts/map.tcl (modified) (1 diff)

trunk/gui/scripts/map.tcl

@@ -497 +497 @@
 
 itcl::body Rappture::Map::setStyle { style } {
+    if {$style != "" && [llength $style] % 2 != 0} {
+        error "Bad map style, must be key/value pairs"
+    }
+    array set styleinfo $style
+    foreach key [array names styleinfo] {
+        set valid 0
+        foreach validkey {-ambient -color -edgecolor -edges -lighting -linewidth -vertscale -wireframe} {
+            if {$key == $validkey} {
+                set valid 1
+                break
+            }
+        }
+        if {!$valid} {
+            error "Unknown style setting: $key"
+        }
+    }
     $_tree set root "style" $style
 }