Changeset 3087

Timestamp:

Jul 11, 2012, 10:28:29 AM (12 years ago)

Author:

mmc

Message:

Fixed a problem in the enable condition processing for choice values like
input.choice(material) == "Bi2Te3". The string "Bi2Te3" wasn't being
treated as a quoted string. Instead, the "Bi2" part was being treated
as a name like input.xxx. It now looks for the leading quote and then
finds the trailing quote and leaves the quoted string alone.

File:

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

trunk/gui/scripts/controls.tcl

@@ -216 +216 @@
                 foreach {s0 s1} $match break
 
-                if {[string index $rest [expr {$s0-1}]] == "\""
-                      && [string index $rest [expr {$s1+1}]] == "\""} {
+                if {[string index $rest [expr {$s0-1}]] == "\""} {
                     # string in ""'s? then leave it alone
-                    append enable [string range $rest 0 $s1]
-                    set rest [string range $rest [expr {$s1+1}] end]
+                    append enable [string range $rest 0 [expr {$s0-1}]]
+                    set rest [string range $rest $s0 end]
+                    if {[regexp -indices {[^\"]+\"} $rest match]} {
+                        foreach {s0 s1} $match break
+                        append enable [string range $rest $s0 $s1]
+                        set rest [string range $rest [expr {$s1+1}] end]
+                    } else {
+                        puts stderr "WARNING: mismatched quote in enable condition for $path"
+                        puts stderr "   expr: [string trim [$_owner xml get $path.about.enable]]"
+                        set rest ""
+                    }
                 } else {
                     #