Changeset 1140

Timestamp:

Sep 3, 2008, 4:40:48 PM (16 years ago)

Author:

gah

Message:

small fixes to xylegend

Location:

trunk/gui/scripts

Files:

• panes.tcl (modified) (1 diff)
• sequenceresult.tcl (modified) (1 diff)
• xylegend.tcl (modified) (2 diffs)
• xyresult.tcl (modified) (4 diffs)

trunk/gui/scripts/panes.tcl

@@ +1 @@
+
 # ----------------------------------------------------------------------
 #  COMPONENT: Panes - creates a series of adjustable panes

trunk/gui/scripts/sequenceresult.tcl

@@ -289 +289 @@
 itcl::body Rappture::SequenceResult::download {option args} {
     if { ![winfo exists $itk_component(area).viewer] } {
-        return ""; # No data, no viewer, no download.
+        return "";      # No data, no viewer, no download.
     }
     switch $option {

trunk/gui/scripts/xylegend.tcl

@@ -101 +101 @@
     set controls $itk_component(controls)
     grid $itk_component(controls) -column 0 -row 1 -sticky nsew
+    grid columnconfigure $itk_component(hull) 0 -weight 1
     grid rowconfigure $itk_component(hull) 1 -weight 0
     grid rowconfigure $itk_component(hull) 0 -weight 1
@@ -370 +371 @@
         }
         2 {
-            foreach n { hide show toggle difference } {
+            foreach n { hide show toggle difference average } {
                 $itk_component(controls).$n configure -state normal
             }
         }
         default {
-            foreach n { hide show toggle } {
+            foreach n { hide show toggle average } {
                 $itk_component(controls).$n configure -state normal
             }

trunk/gui/scripts/xyresult.tcl

@@ -923 +923 @@
             # for dealing with xy line plots
             set elem $info(name)
-            foreach {mapx mapy} [_getAxes $_elem2curve($elem)] break
+
+            # Some elements are generated dynamically and therefore will
+            # not have a curve object associated with them.
+            set mapx [$g element cget $elem -mapx]
+            set mapy [$g element cget $elem -mapy]
+            if {[info exists _elem2curve($elem)]} {
+                foreach {mapx mapy} [_getAxes $_elem2curve($elem)] break
+            }
 
             # search again for an exact point -- this time don't interpolate
             set tip ""
+            array unset info
             if {[$g element closest $x $y info -interpolate no]
                   && $info(name) == $elem} {
-                set x [$g axis transform $mapx $info(x)]
-                set y [$g axis transform $mapy $info(y)]
-
-                if {[info exists _elem2curve($elem)]} {
-                    set curve $_elem2curve($elem)
-                    #set tip [$curve hints tooltip]
-                    set tip [$g element cget $elem -label]
-                    if {[info exists info(y)]} {
-                        set val [_axis format y dummy $info(y)]
-                        set units [$curve hints yunits]
-                        append tip "\n$val$units"
-
-                        if {[info exists info(x)]} {
-                            set val [_axis format x dummy $info(x)]
-                            set units [$curve hints xunits]
-                            append tip " @ $val$units"
-                        }
-                    }
-                    set tip [string trim $tip]
-                }
+
+                set x [$g axis transform $mapx $info(x)]
+                set y [$g axis transform $mapy $info(y)]
+                
+                if {[info exists _elem2curve($elem)]} {
+                    set curve $_elem2curve($elem)
+                    set yunits [$curve hints yunits]
+                    set xunits [$curve hints xunits]
+                } else {
+                    set xunits ""
+                    set yunits ""
+                }
+                set tip [$g element cget $elem -label]
+                set yval [_axis format y dummy $info(y)]
+                append tip "\n$yval$yunits"
+                set xval [_axis format x dummy $info(x)]
+                append tip " @ $xval$xunits"
+                set tip [string trim $tip]
             }
             set state 1
@@ -954 +960 @@
             # for dealing with xy scatter plot
             set elem $info(name)
-            foreach {mapx mapy} [_getAxes $_elem2curve($elem)] break
-
-            # search again for an exact point -- this time don't interpolate
+
+            # Some elements are generated dynamically and therefore will
+            # not have a curve object associated with them.
+            set mapx [$g element cget $elem -mapx]
+            set mapy [$g element cget $elem -mapy]
+            if {[info exists _elem2curve($elem)]} {
+                foreach {mapx mapy} [_getAxes $_elem2curve($elem)] break
+            }
+
             set tip ""
-            if {$info(name) == $elem} {
-                set x [$g axis transform $mapx $info(x)]
-                set y [$g axis transform $mapy $info(y)]
-
-                if {[info exists _elem2curve($elem)]} {
-                    set curve $_elem2curve($elem)
-                    #set tip [$curve hints tooltip]
-                    set tip [$g element cget $elem -label]
-                    if {[info exists info(y)]} {
-                        set val [_axis format y dummy $info(y)]
-                        set units [$curve hints yunits]
-                        append tip "\n$val$units"
-
-                        if {[info exists info(x)]} {
-                            set val [_axis format x dummy $info(x)]
-                            set units [$curve hints xunits]
-                            append tip " @ $val$units"
-                        }
-                    }
-                    set tip [string trim $tip]
-                }
-            }
+            set x [$g axis transform $mapx $info(x)]
+            set y [$g axis transform $mapy $info(y)]
+                
+            if {[info exists _elem2curve($elem)]} {
+                set curve $_elem2curve($elem)
+                set yunits [$curve hints yunits]
+                set xunits [$curve hints xunits]
+            } else {
+                set xunits ""
+                set yunits ""
+            }
+            set tip [$g element cget $elem -label]
+            set yval [_axis format y dummy $info(y)]
+            append tip "\n$yval$yunits"
+            set xval [_axis format x dummy $info(x)]
+            append tip " @ $xval$xunits"
+            set tip [string trim $tip]
             set state 1
         } else {
@@ -1001 +1008 @@
         set _hilite(elem) $elem
 
-        if 0 {
-        set dlist [$g element show]
-        set i [lsearch -exact $dlist $elem]
-        if {$i >= 0} {
-            set dlist [lreplace $dlist $i $i]
-            lappend dlist $elem
-            $g element show $dlist
-        }
+        set mapx [$g element cget $elem -mapx]
+        set mapy [$g element cget $elem -mapy]
+        if {[info exists _elem2curve($elem)]} {
+            foreach {mapx mapy} [_getAxes $_elem2curve($elem)] break
         }
-        foreach {mapx mapy} [_getAxes $_elem2curve($elem)] break
-
         set allx [$g x2axis use]
         if {[llength $allx] > 0} {
@@ -1609 +1610 @@
     switch -- ${what} {
         "activate" {
-            pack $itk_component(legend) 
+            pack $itk_component(legend) -expand yes -fill both 
             after idle [list focus $itk_component(legend)]
         }