Changeset 4006 for branches/1.3

Timestamp:

Oct 9, 2013, 9:27:32 PM (11 years ago)

Author:

gah

Message:

fix axis mappings for alternate axes. fix tooltip for elements with alternate axes.

File:

• branches/1.3/gui/scripts/xyresult.tcl (modified) (17 diffs)

branches/1.3/gui/scripts/xyresult.tcl

@@ -173 +173 @@
     itk_component add plot {
         blt::graph $f.plot \
-            -highlightthickness 0 -plotpadx 0 -plotpady 4 \
-            -rightmargin 10
+            -highlightthickness 0 -plotpadx 0 -plotpady 4 
     } {
         keep -background -foreground -cursor -font
@@ -277 +276 @@
     }
     set type [$dataobj hints type]
+    
     foreach cname [$dataobj components] {
         set tag $dataobj-$cname
@@ -283 +283 @@
             "bar" {
                 $g bar configure $elem -foreground $color -background $color \
-                    -hide no
+                    -hide no 
             } 
             "scatter" {
-                $g line configure $elem -color $color -hide no
+                $g line configure $elem -color $color -hide no 
             }
             default {
                 $g line configure $elem -color $color -hide no \
-                    -linewidth $linewidth
+                    -linewidth $linewidth 
             }
         }
@@ -524 +524 @@
         $g marker configure $id -element $elem
         $g marker bind $id <Enter> \
-            [itcl::code $this EnterMarker $g y-$label $at $xmin $at]
+            [itcl::code $this EnterMarker $g $label $at $xmin $at]
         $g marker bind $id <Leave> \
-            [itcl::code $this LeaveMarker $g y-$label]
+            [itcl::code $this LeaveMarker $g $label]
         set options [GetLineMarkerOptions $style]
         if { $options != "" } {
@@ -645 +645 @@
             set elem $info(name)
 
-            # Some elements are generated dynamically and therefore will
-            # not have a data object associated with them.
             set mapx [$g element cget $elem -mapx]
             set mapy [$g element cget $elem -mapy]
-            if {[info exists _elem2comp($elem)]} {
-                foreach {dataobj cname} [split $_elem2comp($elem) -] break
-                foreach {mapx mapy} [GetAxes $dataobj] break
-            }
 
             # search again for an exact point -- this time don't interpolate
@@ -662 +656 @@
                 set x [$g axis transform $mapx $info(x)]
                 set y [$g axis transform $mapy $info(y)]
-                
                 if {[info exists _elem2comp($elem)]} {
                     foreach {dataobj cname} [split $_elem2comp($elem) -] break
@@ -683 +676 @@
             set elem $info(name)
 
-            # Some elements are generated dynamically and therefore will
-            # not have a data object associated with them.
             set mapx [$g element cget $elem -mapx]
             set mapy [$g element cget $elem -mapy]
-            if {[info exists _elem2comp($elem)]} {
-                foreach {dataobj cname} [split $_elem2comp($elem) -] break
-                foreach {mapx mapy} [GetAxes $dataobj] break
-            }
 
             set tip ""
@@ -739 +726 @@
         set allx [$g x2axis use]
         if {[llength $allx] > 0} {
-            lappend allx x  ;# fix main x-axis too
+            lappend allx x  ;           # fix main x-axis too
             foreach axis $allx {
                 if {$axis == $mapx} {
@@ -752 +739 @@
         set ally [$g y2axis use]
         if {[llength $ally] > 0} {
-            lappend ally y  ;# fix main y-axis too
+            lappend ally y  ;           # fix main y-axis too
             foreach axis $ally {
                 if {$axis == $mapy} {
@@ -763 +750 @@
             }
         }
-
         if {"" != $tip} {
             $g crosshairs configure -hide no -position @$x,$y
@@ -1042 +1028 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::XyResult::GetAxes {dataobj} {
-    # rebuild if needed, so we know about the axes
-    if 0 {
-        # Don't do this. Given dataobj may be deleted in the rebuild
-
-        # rebuild if needed, so we know about the axes
-        if {[$_dispatcher ispending !rebuild]} {
-            $_dispatcher cancel !rebuild
-            $_dispatcher event -now !rebuild
-        }
-    }
-    # what is the x axis?  x? x2? x3? ...
     set xlabel [$dataobj hints xlabel]
-    if {[info exists _label2axis(x-$xlabel)]} {
-        set mapx $_label2axis(x-$xlabel)
+    if {[info exists _label2axis($xlabel)]} {
+        set mapx $_label2axis($xlabel)
     } else {
         set mapx "x"
     }
 
-    # what is the y axis?  y? y2? y3? ...
     set ylabel [$dataobj hints ylabel]
-    if {[info exists _label2axis(y-$ylabel)]} {
-        set mapy $_label2axis(y-$ylabel)
+    if {[info exists _label2axis($ylabel)]} {
+        set mapy $_label2axis($ylabel)
     } else {
         set mapy "y"
     }
-
     return [list $mapx $mapy]
 }
@@ -1517 +1490 @@
                 }
                 $g axis configure $axisName -title $label -hide no \
-                    -checklimits no
+                    -checklimits no -showticks yes
                 set _label2axis($label) $axisName
                 
@@ -1526 +1499 @@
         }
     } 
-    # Next set the axes based on what we've found.
+    # Next, set the axes based on what we've found.
     foreach label [array names _label2axis] {
         set logscale [info exists _limits(${label}-log)] 
@@ -1618 +1591 @@
         set xv [$dataobj mesh $cname]
         set yv [$dataobj values $cname]
-
+        set xev [$dataobj xErrorValues $cname]
+        set yev [$dataobj yErrorValues $cname]
         if {([$xv length] <= 1) || ($linewidth == 0)} {
             set sym square
@@ -1643 +1617 @@
                         -mapx $mapx \
                         -mapy $mapy \
-                        -hide yes 
+                        -hide yes \
+                        -xerror $xev -yerror $yev
                 } 
                 "scatter" {                
@@ -1655 +1630 @@
                         -mapx $mapx \
                         -mapy $mapy \
-                        -hide yes 
+                        -hide yes \
+                        -xerror $xev -yerror $yev
                 } 
                 "bar" {
@@ -1664 +1640 @@
                         -mapx $mapx \
                         -mapy $mapy \
-                        -hide yes
+                        -hide yes \
+                        -xerror $xev -yerror $yev
                 }
             }
         } else {
-            if 0 {
-            set elem $_comp2elem($tag)
-            switch -- $type {
-                "scatter" {
-                    $g line configure $elem \
-                        -symbol $sym \
-                        -pixels $pixels \
-                        -linewidth 0 
-                } 
-                "line" {
-                    $g line configure $elem \
-                        -symbol $sym \
-                        -pixels $pixels \
-                        -linewidth $linewidth \
-                        -dashes $dashes 
-                } 
-                "bar" {
-                    $g bar configure $elem \
-                        -barwidth $barwidth \
-                        -label $label 
-                }
-            }
-            }
-        }
-    }
-}
+            $g element configure $_comp2elem($tag) -mapx $mapx -mapy $mapy
+        }
+    } 
+}