Changeset 3099 for trunk/gui

Timestamp:

Jul 16, 2012, 6:03:04 PM (12 years ago)

Author:

mmc

Message:

Fixed a problem with number/integer results that showed up during the
NCN Summer School in July 2012. Plots with negative values were throwing
errors (needed a -- switch). Plots versus choices like "Add" and "Subtract"
were throwing errors too. These are fixed now.

Fixed a problem with the HTML file for a "note" in the builder. The relative
file path wasn't being found properly in cases where the tool directory was
"." (current directory).

Location:

trunk/gui/scripts

Files:

• numberresult.tcl (modified) (1 diff)
• resultset.tcl (modified) (3 diffs)

trunk/gui/scripts/numberresult.tcl

@@ -1489 +1489 @@
 itcl::body Rappture::NumberResult::GetValue {dataobj {which both}} {
     if {[info exists _dataobj2param($dataobj)]} {
-        set x [lindex $_dataobj2param($dataobj) 0]
+        set x [lindex $_dataobj2param($dataobj) 1]
     } else {
         set x 0

trunk/gui/scripts/resultset.tcl

@@ -203 +203 @@
             }
 
-            if {$which eq "all"} {
-                set rlist ""
-                # build an array of normalized values and their labels
-                if {$col == "simnum"} {
-                    set nruns [$_results size]
-                    for {set n 0} {$n < $nruns} {incr n} {
-                        set simnum [$_results get -format simnum $n]
-                        lappend rlist $simnum $n
+            set rlist ""
+            # build an array of normalized values and their labels
+            if {$col == "simnum"} {
+                set nruns [$_results size]
+                for {set n 0} {$n < $nruns} {incr n} {
+                    set simnum [$_results get -format simnum $n]
+                    lappend rlist $simnum $n
+                }
+            } else {
+                set havenums 1
+                foreach rec [$_results get -format [list xmlobj $col]] {
+                    set xo [lindex $rec 0]
+                    set v [lindex $rec 1]
+                    foreach {raw norm} \
+                        [Rappture::LibraryObj::value $xo $col] break
+
+                    if {![info exists unique($v)]} {
+                        # keep only unique label strings
+                        set unique($v) $norm
+                    }
+                    if {$havenums && ![string is double $norm]} {
+                        set havenums 0
+                    }
+                }
+
+                if {!$havenums} {
+                    # don't have normalized nums? then sort and create nums
+                    set rlist ""
+                    set n 0
+                    foreach val [lsort -dictionary [array names unique]] {
+                        lappend rlist $val [incr n]
                     }
                 } else {
-                    set havenums 1
-                    foreach rec [$_results get -format [list xmlobj $col]] {
-                        set xo [lindex $rec 0]
-                        set v [lindex $rec 1]
-                        foreach {raw norm} \
-                            [Rappture::LibraryObj::value $xo $col] break
-
-                        if {![info exists unique($v)]} {
-                            # keep only unique label strings
-                            set unique($v) $norm
-                        }
-                        if {$havenums && ![string is double $norm]} {
-                            set havenums 0
-                        }
-                    }
-
-                    if {!$havenums} {
-                        # don't have normalized nums? then sort and create nums
-                        set rlist ""
-                        set n 0
-                        foreach val [lsort -dictionary [array names unique]] {
-                            lappend rlist $val [incr n]
-                        }
-                    } else {
-                        set rlist [array get unique]
-                    }
-                }
+                    set rlist [array get unique]
+                }
+            }
+
+            if {$which eq "all"} {
                 return $rlist
             }
@@ -246 +247 @@
             set irun [lindex [$_results find -format xmlobj $which] 0]
             if {$irun ne ""} {
-                if {$col == "simnum"} {
-                    set val [$_results get -format simnum $irun]
-                    return [list $irun $val]
-                } else {
-                    # Be careful giving singleton elements as the
-                    # "columns" argument to "Tuples::get". It is
-                    # expecting a list.
-                    foreach {raw norm} \
-                        [Rappture::LibraryObj::value $which $col] break
-                    return [list $norm $raw]
+                set val [$_results get -format $col $irun]
+                array set val2norm $rlist
+                if {[info exists val2norm($val)]} {
+                    return [list $val $val2norm($val)]
                 }
             }
@@ -279 +274 @@
 
     set rlist ""
-    foreach irun [$_results find -format $collist $vallist] {
+    foreach irun [$_results find -format $collist -- $vallist] {
         lappend rlist [$_results get -format xmlobj $irun]
     }