Changeset 5560 for branches/1.3

Timestamp:

May 19, 2015 8:15:27 AM (9 years ago)

Author:

mmh

Message:

revert histogram changes

File:

• branches/1.3/gui/scripts/histogram.tcl (modified) (12 diffs)

branches/1.3/gui/scripts/histogram.tcl

@@ -1 @@
-# -*- mode: tcl; indent-tabs-mode: nil -*-
-
+# -*- mode: tcl; indent-tabs-mode: nil -*- 
+ 
 # ----------------------------------------------------------------------
 #  COMPONENT: histogram - extracts data from an XML description of a field
@@ -37 +37 @@
     protected method Build {}
     private method Clear { {comp ""} }
-    private method ParseData { comp }
+    private method ParseData { comp } 
 
     private variable _xmlobj ""  ;# ref to lib obj with histogram data
     private variable _hist ""    ;# lib obj representing this histogram
-    private variable _widths     ;# array of vectors of bin widths
-    private variable _yvalues    ;# array of vectors of bin heights along
+    private variable _widths     ;# array of vectors of bin widths 
+    private variable _yvalues    ;# array of vectors of bin heights along 
                                  ;# y-axis.
-    private variable _xvalues    ;# array of vectors of bin locations along
+    private variable _xvalues    ;# array of vectors of bin locations along 
                                  ;# x-axis.
     private variable _xlabels    ;# array of labels
@@ -74 +74 @@
     # don't destroy the _xmlobj! we don't own it!
     itcl::delete object $_hist
-    Clear
-}
-
-# ----------------------------------------------------------------------
-# USAGE: mesh
+    Clear 
+}
+
+# ----------------------------------------------------------------------
+# USAGE: mesh 
 #
 # Returns the vector for the histogram bin locations along the
@@ -91 +91 @@
 
 # ----------------------------------------------------------------------
-# USAGE: heights
+# USAGE: heights 
 #
 # Returns the vector for the histogram bin heights along the y-axis.
@@ -103 +103 @@
 
 # ----------------------------------------------------------------------
-# USAGE: widths
+# USAGE: widths 
 #
 # Returns the vector for the specified histogram component <name>.
@@ -117 +117 @@
 
 # ----------------------------------------------------------------------
-# USAGE: xlabels
+# USAGE: xlabels 
 #
 # Returns the vector for the specified histogram component <name>.
@@ -188 +188 @@
     }
 
-    blt::vector create tmp
+    blt::vector create tmp 
     blt::vector create zero
     foreach comp [array names _comphist] {
@@ -257 +257 @@
             xdesc   xaxis.description
             xunits  xaxis.units
-            xorient xaxis.orientation
+            xorient xaxis.orientation 
             xscale  xaxis.scale
             xmin    xaxis.min
@@ -342 +342 @@
 #       Parse the components data representations.  The following
 #       elements may be used <xy>, <xhw>, <namevalue>, <xvector>,
-#       <yvector>.  Only one element is used for data.
+#       <yvector>.  Only one element is used for data.  
 #
 itcl::body Rappture::Histogram::ParseData { comp } {
@@ -354 +354 @@
     if { $xydata != "" } {
         set count 0
-        foreach {name value} [regexp -all -inline {\S+} $xydata] {
-            $_yvalues($comp) append $value
-            $_xvalues($comp) append $count
-            lappend _xlabels($comp) $name
-            incr count
-        }
+        foreach line [split $xydata \n] {
+            if {[llength $line] == 2} {
+                foreach {name value} $line break
+                $_yvalues($comp) append $value
+                $_xvalues($comp) append $count
+                lappend _xlabels($comp) $name
+                incr count
+            }
+        }           
         set _comp2hist($comp) [list $_xvalues($comp) $_yvalues($comp)]
         return
@@ -366 +369 @@
     if { $xhwdata != "" } {
         set count 0
-        foreach {name h w} [regexp -all -inline {\S+} $xhwdata] {
-            lappend _xlabels($comp) $name
-            $_xvalues($comp) append $count
-            $_yvalues($comp) append $h
-            $_widths($comp) append $w
-            incr count
-        }
+        foreach line [split $xhwdata \n] {
+            set n [scan $line {%s %s %s} name h w]
+            if {$n >= 2} {
+                lappend _xlabels($comp) $name
+                $_xvalues($comp) append $count
+                $_yvalues($comp) append $h
+                if { $n == 3 } {
+                    $_widths($comp) append $w
+                }
+                incr count
+            }
+        }           
         set _comp2hist($comp) [list $_xvalues($comp) $_yvalues($comp)]
         return
-    }
-
-    # If we reached here, must be <yvector>
-    $_yvalues($comp) set [$_hist get ${comp}.yvector]
-    $_xvalues($comp) length [$_yvalues($comp) length]
-    $_xvalues($comp) seq 1 [$_yvalues($comp) length]
-    set _xlabels($comp) [$_hist get ${comp}.xvector]
+
+        # FIXME:  There must be a width specified for each bin location.
+        #         If this isn't true, we default to uniform widths
+        #         (zero-length _widths vector == uniform).
+        if { [$_xvalues($comp) length] != [$_widths($comp) length] } {
+            $_widths($comp) set {}
+        }
+        set _comp2hist($comp) [list $_xvalues($comp) $_yvalues($comp)]
+        return
+    }
+    set xv [$_hist get $comp.xvector]
+    set yv [$_hist get $comp.yvector]
+    if { $xv != "" && $yv != "" } {
+        $_yvalues($comp) set $yv
+        $_xvalues($comp) seq 0 [$yv length]
+        set _xlabels($comp)
+    }
     set _comp2hist($comp) [list $_xvalues($comp) $_yvalues($comp)]
 }
@@ -404 +422 @@
     }
     if { [info exists _widths($comp)] } {
-        blt::vector destroy $_widths($comp)
+        blt::vector destroy $_widths($comp) 
     }
     if { [info exists _yvalues($comp)] } {
-        blt::vector destroy $_yvalues($comp)
+        blt::vector destroy $_yvalues($comp) 
     }
     if { [info exists _xvalues($comp)] } {
-        blt::vector destroy $_xvalues($comp)
+        blt::vector destroy $_xvalues($comp) 
     }
     array unset _xvalues $comp