Changeset 5199

Timestamp:

Apr 10, 2015, 5:11:59 PM (5 years ago)

Author:

mmh

Message:

fix issue with double-counting variables

File:

• branches/uq/lang/tcl/scripts/library.tcl (modified) (5 diffs)

branches/uq/lang/tcl/scripts/library.tcl

@@ -1055 +1055 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::LibraryObj::uq_get_vars {{tfile ""}} {
-    set varlist \[
+    set varout \[
+    set varlist []
 
     if {$tfile == ""} {
@@ -1074 +1075 @@
             [string equal -length 9 $val "gaussian "]} {
 
+            set vname [$_n getAttribute id]
+            if {[lsearch $varlist $vname] >= 0} {
+                continue
+            } else {
+                lappend varlist $vname
+            }
+
             if {$count > 0} {
-                append varlist ,
+                append varout ,
             }
             incr count
@@ -1087 +1095 @@
             }
 
-            set v \[\"[$_n getAttribute id]\",\"$units\",
-            #set val \"[lindex $val 0]\",[lindex $val 1],[lindex $val 2]
+            set v \[\"$vname\",\"$units\",
             set fmt "\[\"%s\",%.16g,%.16g"
             set val [format $fmt [lindex $val 0] [lindex $val 1] [lindex $val 2]]
@@ -1128 +1135 @@
                 $x nodeValue @@[$_n getAttribute id]
             }
-            append varlist $v\]\]
-        }
-    }
-    append varlist \]
+            append varout $v\]\]
+        }
+    }
+    append varout \]
 
     if {$tfile != ""} {
@@ -1140 +1147 @@
         $doc delete
     }
-    if {$varlist == "\[\]"} {set varlist ""}
-    puts "uq_get_vars returning $varlist"
-    return [list $varlist $count]
-}
+    if {$varout == "\[\]"} {set varout ""}
+    puts "uq_get_vars returning $varout"
+    return [list $varout $count]
+}