Changeset 612d116 in tol

Timestamp:

Jan 9, 2012, 9:50:20 AM (15 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

7f11e05

Parents:

6ff8ce3

Message:

fixes #1388

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@3993 be4846ae-f051-483a-831f-b64e7d08527f

Location:

tolbase/lib

Files:

• byswidget/btable/btable.tcl (modified) (1 diff)
• toltk/sergraph.tcl (modified) (2 diffs)

tolbase/lib/byswidget/btable/btable.tcl

@@ -4151 +4151 @@
 
     # insert the series into the table
-    set numCols [$sergrp serie size]
-    set list  [lindex [::tol::seriestat [$sergrp serie 0 reference]] 1]
-    foreach {name value} $list {
-      lappend stat $name
-    }
-    set numRows [llength $stat]
-    
-    for {set i 0} {$i < $numRows} {incr i} {
-      set matrix([expr $i+1],0) [mc [lindex $stat $i]]
-    }
-  
-    for {set j 0} {$j < $numCols} {incr j} {
-      set matrix(0,[expr $j+1]) [$sergrp serie $j name]
-      set values [lindex [::tol::seriestat [$sergrp serie $j reference]] 1]
-      for {set i 0} {$i < $numRows} {incr i} {
-        set matrix([expr $i+1],[expr $j+1]) \
-                  [lindex $values [expr 2*$i+1]]
+    set stats0  [ $sergrp serie 0 stats ]
+    set numRows [ llength $stats0 ]
+    set numCols [ $sergrp serie size ]
+
+    set row 1
+    foreach {name value} $stats0 {
+      set matrix($row,0) [ mc $name ]
+      incr row
+    }
+    
+    for { set j 0 } { $j < $numCols } { incr j } {
+      set col [ expr { $j + 1 } ]
+      set matrix(0,$col) [ $sergrp serie $j name ]
+      set row 1
+      foreach { s v } [ $sergrp serie $j stats ] {
+        set matrix($row,$col) $v
+        incr row
       }
     }

tolbase/lib/toltk/sergraph.tcl

@@ -1267 +1267 @@
   for {set i 0} {$i < [$sergrp serie size]} {incr i} {
     if $ary(${pre},yMarker$key) {
-      set y [lindex [lindex [::tol::seriestat [$sergrp serie $i reference] $name] 1] 1]
+      array set stats [ $sergrp serie $i stats ]
+      set y $stats($name)
       if {[string equal $y "?"]} {
         tk_messageBox -parent $g -type ok -title [mc "Warning"] \
@@ -1312 +1313 @@
   for {set i 0} {$i < [$sergrp serie size]} {incr i} {
     if $ary(${pre},yMarkerDev) {
-      set dev [lindex [lindex [::tol::seriestat [$sergrp serie $i reference] "Std. Dev."] 1] 1]
-      set avg [lindex [lindex [::tol::seriestat [$sergrp serie $i reference] "Average"] 1] 1]
-      if {[expr [string equal $dev "?"] || [string equal $avg "?"]]} {
+      array set stats [ $sergrp serie $i stats ]
+      set dev $stats(Std. Dev.)
+      set avg $stats(Average)
+      if { $dev eq "?" || $avg eq "?" } {
         tk_messageBox -parent $g -type ok -title [mc "Warning"] \
-         -message [mc "Cant draw '%1\$s' y marker because its value is ?" [mc {Std. Dev.}]]
+            -message [mc "Cant draw '%1\$s' y marker because its value is ?" [mc {Std. Dev.}]]
       } else {
         set y1 [expr $avg + $ary(${pre},yMarkerNDev) * $dev]