Changeset 2315 for branches/blt4

Timestamp:

Jul 20, 2011, 5:24:54 PM (13 years ago)

Author:

gah

Message:

 

Location:

branches/blt4/gui/scripts

Files:

• bugreport.tcl (modified) (1 diff)
• xyprint.tcl (modified) (3 diffs)
• xyresult.tcl (modified) (7 diffs)

branches/blt4/gui/scripts/bugreport.tcl

@@ -86 +86 @@
         set w [winfo reqwidth .bugreport]
         set h [winfo reqheight .bugreport]
+        incr h 300
         set x [expr {([winfo screenwidth .bugreport]-$w)/2}]
         if {$x < 0} {set x "+0"} else {set x "+$x"}

branches/blt4/gui/scripts/xyprint.tcl

@@ -310 +310 @@
     # Axis component
     foreach axis [$orig axis names] {
+        if { $axis == "z" } {
+            continue
+        }
         if { [$orig axis cget $axis -hide] } {
             continue
@@ -385 +388 @@
     # 
     foreach axis [$_clone axis names] {
+        if { $axis == "z" } {
+            continue
+        }
         if { [$_clone axis cget $axis -hide] } {
             continue
@@ -1368 +1374 @@
     $itk_component(axis_menu) delete all
     foreach axis $names {
+        if { $axis == "z" } {
+            continue
+        }
         if { ![$_clone axis cget $axis -hide] } {
             $itk_component(axis_menu) add -text $axis -value $axis \

branches/blt4/gui/scripts/xyresult.tcl

@@ -292 +292 @@
         set params(-width) 0
     }
-
     # if the color is "auto", then select a color from -autocolors
-    if {$params(-color) == "auto" || $params(-color) == "autoreset"} {
+    if { $params(-color) == "auto" || $params(-color) == "autoreset" } {
         if {$params(-color) == "autoreset"} {
             set _autoColorI 0
         }
-        set color [lindex $itk_option(-autocolors) $_autoColorI]
-        if {"" == $color} { set color black }
+        set color [lindex $itk_option(-autocolors) $_autoColorI]
+        if { "" == $color} { 
+            set color black 
+        }
         set params(-color) $color
-
         # set up for next auto color
         if {[incr _autoColorI] >= [llength $itk_option(-autocolors)]} {
@@ -319 +319 @@
         set params(-color) [Rappture::color::brightness \
             $params(-color) $params(-brightness)]
-
         set bg [$itk_component(plot) cget -plotbackground]
         foreach {h s v} [Rappture::color::RGBtoHSV $bg] break
@@ -432 +431 @@
         # find the axes for this dataobj (e.g., {x y2})
         foreach {map(x) map(y)} [GetAxes $dataobj] break
-
         foreach axis {x y} {
             # get defaults for both linear and log scales
@@ -439 +437 @@
                 set id $map($axis)$type
                 foreach {min max} [$dataobj limits $axis$type] break
+                set amin [$dataobj hints ${axis}min]
+                set amax [$dataobj hints ${axis}max]
+                if { $amin != "" } {
+                    set min $amin
+                }
+                if { $amax != "" } {
+                    set max $amax
+                }
                 if {"" != $min && "" != $max} {
                     if {![info exists _limits($id-min)]} {
@@ -453 +459 @@
                 }
             }
-
             if {[$dataobj hints ${axis}scale] == "log"} {
                 Axis scale $map($axis) log
@@ -645 +650 @@
         set label [$dataobj hints label]
         foreach {mapx mapy} [GetAxes $dataobj] break
-
         foreach comp [$dataobj components] {
             set xv [$dataobj mesh $comp]
@@ -653 +657 @@
                 set color $_dataobj2color($dataobj)
             } else {
-                set color [$dataobj hints color]
-                if {"" == $color} {
-                    set color black
-                }
-            }
-
+                set color black
+            }
             if {[info exists _dataobj2width($dataobj)]} {
                 set lwidth $_dataobj2width($dataobj)