Changeset 5192 for branches

Timestamp:

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

Author:

mmh

Message:

fix job count for UQ dialog

Location:

branches/uq

Files:

• gui/scripts/numberentry.tcl (modified) (1 diff)
• gui/scripts/probdisteditor.tcl (modified) (3 diffs)
• gui/scripts/tempgauge.tcl (modified) (1 diff)
• gui/scripts/uq.tcl (modified) (3 diffs)
• lang/tcl/scripts/library.tcl (modified) (9 diffs)
• lang/tcl/scripts/task.tcl (modified) (2 diffs)

branches/uq/gui/scripts/numberentry.tcl

@@ -42 +42 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::NumberEntry::constructor {owner path args} {
-    puts "NumberEntry '$path' '$args'"
     set varname [lindex [split $path ()] end-1]
     if {[catch {$owner isa Rappture::ControlOwner} valid] != 0 || !$valid} {

branches/uq/gui/scripts/probdisteditor.tcl

@@ -200 +200 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::ProbDistEditor::value {{newval ""}} {
-    puts "PDE::value $newval"
+    # puts "PDE::value $newval"
 
     #FIXME: _value has numerical values _uvalue has value with units
@@ -286 +286 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::ProbDistEditor::mode {{newval ""}} {
-    puts "PDE::mode mode=$newval min=$_umin max=$_umax units=$_units"
+    # puts "PDE::mode mode=$newval min=$_umin max=$_umax units=$_units"
 
     set modes {exact uniform gaussian custom}
@@ -606 +606 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::ProbDistEditor::_apply {op {widget ""}} {
-    puts "PDE::_apply $op $widget"
+    #puts "PDE::_apply $op $widget"
     if {$op != "bindings"} {
         # need this for value/finalize

branches/uq/gui/scripts/tempgauge.tcl

@@ -73 +73 @@
 
     if {"" != $itk_option(-spectrum)} {
-        puts "TemperatureGauge"
         set color [$itk_option(-spectrum) get [value]]
-        puts "TemperatureGauge: color=$color"
         set frac [$itk_option(-spectrum) get -fraction [value]]
     } else {

branches/uq/gui/scripts/uq.tcl

@@ -4 +4 @@
 itcl::class Rappture::UQ {
 
-    constructor {varlist type uqargs} {
+    constructor {varlist num type uqargs} {
         puts "Rappture::UQ constructor $varlist:$type:$uqargs"
         set _varlist $varlist
         set _type $type
         set _args $uqargs
+        set _num $num
     }
 
@@ -30 +31 @@
     private variable _num_pts {}
     private variable _go ""
+    private variable _num 0
 }
 
@@ -118 +120 @@
 
 itcl::body Rappture::UQ::num_runs {} {
-    set numvars  [llength $_varlist]
-    # puts "UQ num_runs $numvars $_type $_args"
+    puts "varlist=$_varlist"
+    set numvars  $_num
+    puts "UQ num_runs $numvars $_type $_args"
     if {![array exists _num_pts]} { _init_num_pts_array }
     switch $_type {

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]
+}

branches/uq/lang/tcl/scripts/task.tcl

@@ -129 +129 @@
         }
     }
-    set varlist [$_xmlobj uq_get_vars]
-    return [Rappture::UQ ::#auto $varlist $uq_type $uq_args]
+    #set varlist [$_xmlobj uq_get_vars]
+    foreach {varlist num} [$_xmlobj uq_get_vars] break
+    return [Rappture::UQ ::#auto $varlist $num $uq_type $uq_args]
 }
 
@@ -222 +223 @@
         # Return a list of the UQ variables and their PDFs.
         # Also turns $tfile into a template file.
-        set uq_varlist [$_xmlobj uq_get_vars $tfile]
+        set uq_varlist [lindex [$_xmlobj uq_get_vars $tfile] 0]
     }