Changeset 25 for trunk/gui

Timestamp:

Jul 18, 2005 7:31:19 AM (19 years ago)

Author:

mmc

Message:

Added <min>, <max>, and <scale> directives to the output plotter
for <curve> objects. If you specify any of these within an axis
for a curve, they set the default characteristics for the axis.

Location:

trunk/gui/scripts

Files:

• curve.tcl (modified) (1 diff)
• loader.tcl (modified) (1 diff)
• xyresult.tcl (modified) (4 diffs)

trunk/gui/scripts/curve.tcl

@@ -155 +155 @@
         xunits  xaxis.units
         xscale  xaxis.scale
+        xmin    xaxis.min
+        xmax    xaxis.max
         ylabel  yaxis.label
         yunits  yaxis.units
         yscale  yaxis.scale
+        ymin    yaxis.min
+        ymax    yaxis.max
     } {
         set str [$_curve get $path]

trunk/gui/scripts/loader.tcl

@@ -117 +117 @@
     #
     set str [$_owner xml get $path.default]
-    if {$str != ""} { after 500 [itcl::code $this value $str] }
+    if {$str != ""} { after 1000 [itcl::code $this value $str] }
 }
 

trunk/gui/scripts/xyresult.tcl

@@ -277 +277 @@
     # first clear out the widget
     eval $g element delete [$g element names]
-    $g axis configure y -min "" -max ""
+    $g axis configure x -min "" -max "" -logscale 0
+    $g axis configure y -min "" -max "" -logscale 0
 
     # extract axis information from the first curve
@@ -304 +305 @@
     }
 
+    foreach lim {xmin xmax ymin ymax} {
+        set limits($lim) ""
+    }
+
     # plot all of the curves
     set count 0
     foreach xydata $clist {
         foreach comp [$xydata components] {
+            catch {unset hints}
+            array set hints [$xydata hints]
+
             set xv [$xydata mesh $comp]
             set yv [$xydata values $comp]
@@ -314 +322 @@
                 set color $_curve2color($xydata)
             } else {
-                set color [$xydata hints color]
-                if {"" == $color} {
+                if {[info exists hints(color)]} {
+                    set color $hints(color)
+                } else {
                     set color black
                 }
@@ -341 +350 @@
             set _elem2curve($elem) $xydata
 
-            set label [$xydata hints label]
+            if {[info exists hints(label)]} {
+                set label $hints(label)
+            } else {
+                set label ""
+            }
             $g element create $elem -x $xv -y $yv \
                 -symbol $sym -pixels 6 -linewidth $lwidth -label $label \
                 -color $color -dashes $dashes
-        }
-    }
-
+
+            if {[info exists hints(xscale)] && $hints(xscale) == "log"} {
+                $g xaxis configure -logscale 1
+            }
+            if {[info exists hints(yscale)] && $hints(yscale) == "log"} {
+                $g yaxis configure -logscale 1
+            }
+
+            # see if there are any hints on limit
+            foreach lim {xmin xmax ymin ymax} {
+                if {[info exists hints($lim)] && "" != $hints($lim)} {
+                    set limits($lim) $hints($lim)
+                }
+            }
+        }
+    }
+
+    # add any limit directives from the curve objects
+    foreach lim {xmin xmax ymin ymax} var {_xmin _xmax _vmin _vmax} {
+        if {"" != $limits($lim)} {
+            set $var $limits($lim)
+        }
+    }
     _fixLimits
 }