Changeset 5192 for branches/uq/lang/tcl/scripts/library.tcl

Timestamp:

Apr 5, 2015, 10:48:26 PM (10 years ago)

Author:

mmh

Message:

fix job count for UQ dialog

File:

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

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

@@ -690 +690 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::LibraryObj::diff {libobj} {
-
-    puts "Library DIFF $libobj"
     set rlist ""
 
@@ -698 +696 @@
     set otherv [Rappture::entities $libobj input]
 
-    puts "thisv=$thisv\n"
-    puts "otherv=$otherv\n"
-
     # scan through values for this object, and compare against other one
     foreach path $thisv {
-      puts "path=$path"
         set i [lsearch -exact $otherv $path]
         if {$i < 0} {
@@ -709 +703 @@
             lappend rlist - $path $raw ""
         } else {
-          puts "tvalue=[value $this $path]"
-          puts "ovalue=[value $libobj $path]"
             foreach {traw tnorm} [value $this $path] break
             foreach {oraw onorm} [value $libobj $path] break
-            puts "tnorm=$tnorm onorm=$onorm traw=$traw oraw=$oraw"
             if {![string equal $tnorm $onorm]} {
                 lappend rlist c $path $traw $oraw
@@ -726 +717 @@
         lappend rlist + $path "" $oraw
     }
-    puts "LDIFF returning $rlist"
     return $rlist
 }
@@ -749 +739 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::LibraryObj::value {libobj path} {
-  puts "VALUE $path [$libobj element -as type $path]"
     switch -- [$libobj element -as type $path] {
         structure {
@@ -781 +770 @@
                 # then normalize to default units
                 set units [$libobj get $path.units]
-                puts "val=$val units=$units"
                 if {"" != $units} {
                     set val [Rappture::Units::mconvert $val \
@@ -1078 +1066 @@
     }
 
-    set first 1
+    set count 0
     set n [$node selectNodes /run/input//number]
     foreach _n $n {
@@ -1086 +1074 @@
             [string equal -length 9 $val "gaussian "]} {
 
-            if {$first == 1} {
-                set first 0
-            } else {
+            if {$count > 0} {
                 append varlist ,
             }
+            incr count
 
             set units ""
@@ -1155 +1142 @@
     if {$varlist == "\[\]"} {set varlist ""}
     puts "uq_get_vars returning $varlist"
-    return $varlist
-}
+    return [list $varlist $count]
+}