Changeset 6225 for trunk/gui

Timestamp:

Mar 30, 2016, 11:00:44 AM (9 years ago)

Author:

ldelgass

Message:

Validation for select arguments, add select mode option

File:

• trunk/gui/scripts/mapviewer.tcl (modified) (3 diffs)

trunk/gui/scripts/mapviewer.tcl

@@ -934 +934 @@
 # ----------------------------------------------------------------------
 # USAGE: select clear
-# USAGE: select feature <args...>
-# USAGE: select annotation <args...>
+# USAGE: select feature add|delete|set <featureIDList> <layerName>
+# USAGE: select mode <boolean>
 #
 # Clients use this method to notify the map widget of a selection event
@@ -942 +942 @@
 itcl::body Rappture::MapViewer::select {option {args ""}} {
     switch $option {
-        "annotation" {
-            SendCmd "select annotation $args"
-        }
         "clear" {
+            if {[llength $args] > 0} {
+                error "wrong # args: should be \"select clear\""
+            }
             SendCmd "select clear"
         }
         "feature" {
+            if {[llength $args] != 3} {
+                error "wrong #args: should be \"select feature <op> <featureIDList> <layerName>\""
+            }
             set op [lindex $args 0]
             set layer [lindex $args end]
@@ -969 +972 @@
                 }
             }
+        }
+        "mode" {
+            if {[llength $args] != 1} {
+                error "wrong # args: should be \"select mode <boolean>\""
+            }
+            if {![string is boolean $args]} {
+                error "argument to \"select mode\" must be boolean"
+            }
+            SendCmd "select mode $args"
         }
         default {