Changeset 4000 for trunk/gui/scripts/curve.tcl

Timestamp:

Oct 9, 2013 8:10:24 PM (11 years ago)

Author:

gah

Message:

bugfix: remove -rightmargin option from graph

File:

• trunk/gui/scripts/curve.tcl (modified) (6 diffs)

trunk/gui/scripts/curve.tcl

@@ -32 +32 @@
 
     public method components {{pattern *}}
-    public method mesh {{what -overall}}
-    public method values {{what -overall}}
+    public method mesh {cname }
+    public method values { cname }
     public method limits {which}
     public method hints {{key ""}}
     public method xmarkers {}
     public method ymarkers {}
+    public method xErrorValues { cname }
+    public method yErrorValues { cname}
 
     protected method _build {}
 
-    private variable _xmlobj ""  ;# ref to lib obj with curve data
-    private variable _curve ""   ;# lib obj representing this curve
-    private variable _comp2xy    ;# maps component name => x,y vectors
-    private variable _hints      ;# cache of hints stored in XML
-
-    private variable _xmarkers "";# list of {x,label,options} triplets.
-    private variable _ymarkers "";# list of {y,label,options} triplets.
-    private common _counter 0    ;# counter for unique vector names
+    private variable _xmlobj ""  ;      # ref to lib obj with curve data
+    private variable _curve ""   ;      # lib obj representing this curve
+    private variable _comp2xy    ;      # maps component name => x,y vectors
+    private variable _hints      ;      # cache of hints stored in XML
+
+    private variable _xmarkers "";      # list of {x,label,options} triplets.
+    private variable _ymarkers "";      # list of {y,label,options} triplets.
+    private common _counter 0    ;      # counter for unique vector names
 }
 
@@ -60 +62 @@
     set _xmlobj $xmlobj
     set _curve [$xmlobj element -as object $path]
-
     # build up vectors for various components of the curve
     _build
@@ -101 +102 @@
 # overall curve (sum of all components).
 # ----------------------------------------------------------------------
-itcl::body Rappture::Curve::mesh {{what -overall}} {
-    if {[info exists _comp2xy($what)]} {
-        return [lindex $_comp2xy($what) 0]  ;# return xv
-    }
-    error "bad option \"$what\": should be [join [lsort [array names _comp2xy]] {, }]"
+itcl::body Rappture::Curve::mesh {cname} {
+    if {[info exists _comp2xy($cname)]} {
+        return [lindex $_comp2xy($cname) 0]  ;# return xv
+    }
+    error "bad component \"$cname\": should be one of [join [lsort [array names _comp2xy]] {, }]"
 }
 
@@ -115 +116 @@
 # overall curve (sum of all components).
 # ----------------------------------------------------------------------
-itcl::body Rappture::Curve::values {{what -overall}} {
-    if {[info exists _comp2xy($what)]} {
-        return [lindex $_comp2xy($what) 1]  ;# return yv
-    }
-    error "bad option \"$what\": should be [join [lsort [array names _comp2xy]] {, }]"
+itcl::body Rappture::Curve::values {cname} {
+    if {[info exists _comp2xy($cname)]} {
+        return [lindex $_comp2xy($cname) 1]  ;# return yv
+    }
+    error "bad component \"$cname\": should be one of [join [lsort [array names _comp2xy]] {, }]"
+}
+
+# ----------------------------------------------------------------------
+# USAGE: xErrorValues <name>
+#
+# Returns the xvec for the specified curve component <name>.
+# If the name is not specified, then it returns the vectors for the
+# overall curve (sum of all components).
+# ----------------------------------------------------------------------
+itcl::body Rappture::Curve::xErrorValues { cname } {
+    if {[info exists _comp2xy($cname)]} {
+        return [lindex $_comp2xy($cname) 2]  ;# return xev
+    }
+    error "unknown component \"$cname\": should be one of [join [lsort [array names _comp2xy]] {, }]"
+}
+
+# ----------------------------------------------------------------------
+# USAGE: yErrorValues <name>
+#
+# Returns the xvec for the specified curve component <name>.
+# If the name is not specified, then it returns the vectors for the
+# overall curve (sum of all components).
+# ----------------------------------------------------------------------
+itcl::body Rappture::Curve::yErrorValues { cname } {
+    if {[info exists _comp2xy($cname)]} {
+        return [lindex $_comp2xy($cname) 3]  ;# return yev
+    }
+    error "unknown component \"$cname\": should be one of [join [lsort [array names _comp2xy]] {, }]"
 }
 
@@ -272 +301 @@
         set xv [blt::vector create \#auto]
         set yv [blt::vector create \#auto]
+        set xev [blt::vector create \#auto]
+        set yev [blt::vector create \#auto]
 
         set xydata [$_curve get $cname.xy]
@@ -283 +314 @@
             $yv set [$_curve get $cname.yvector]
         }
-        if { (([$xv length] == 0) && ([$yv length] == 0))
-            || ([$xv length] != [$yv length]) } {
+        if { (([$xv length] == 0) && ([$yv length] == 0)) || 
+             ([$xv length] != [$yv length]) } {
             # FIXME: need to show an error about improper data.
             blt::vector destroy $xv $yv
             set xv ""; set yv ""
-        } else {
-            set _comp2xy($cname) [list $xv $yv]
-            incr _counter
-        }
-    }
+            continue;
+        }
+        $xev set [$_curve get "$cname.xerrorbars"] 
+        $yev set [$_curve get "$cname.yerrorbars"] 
+        set _comp2xy($cname) [list $xv $yv $xev $yev]
+        incr _counter
+    }
+
     # Creates lists of x and y marker data.
     set _xmarkers {}