Changeset 1741 for trunk/gui

Timestamp:

May 25, 2010 3:25:00 PM (14 years ago)

Author:

dkearney

Message:

fix choicehandler to choose the first option in the list if there is no default value given, and check for value tags in options before using the label as the value of the choice.

File:

• trunk/gui/apps/simsim.in (modified) (1 diff)

trunk/gui/apps/simsim.in

@@ -204 +204 @@
     } else {
         set optList [$child children -as object -type option]
+        set optLib ""
         set value ""
-        if {"random" == $valType} {
-            set optIdx [expr {int(rand()*[llength $optList])}]
-            set optLib [lindex $optList $optIdx]
-            set value [$optLib get value]
-        } elseif {"default" == $valType} {
-            set defaultVal [$child get default]
-            foreach optLib $optList {
-                set label [$optLib get about.label]
-                set valTag [$optLib get value]
-                if {($defaultVal == $label) || ($defaultVal == $valTag)} {
-                    set value $valTag
-                    break
+        if {[llength $optList] > 0} {
+            if {"random" == $valType} {
+                set optIdx [expr {int(rand()*[llength $optList])}]
+                set optLib [lindex $optList $optIdx]
+                set value [$optLib get value]
+            } elseif {"default" == $valType} {
+                set defaultVal [$child get default]
+                foreach optLib $optList {
+                    set label [$optLib get about.label]
+                    set valTag [$optLib get value]
+                    if {($defaultVal == $label) || ($defaultVal == $valTag)} {
+                        set value $valTag
+                        break
+                    }
                 }
             }
-        }
-
-        if {"" == $value} {
-            set value [$optLib get about.label]
+
+            if {"" == $value} {
+                set optLib [lindex $optList 0]
+                set value [$optLib get value]
+                if {"" == $value} {
+                    set value [$optLib get about.label]
+                }
+            }
         }
         $child put "current" $value