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

Timestamp:

Sep 11, 2005, 10:49:16 PM (19 years ago)

Author:

mmc

Message:

• Changed the driver to recognize a new FULLSCREEN environment variable. When this is set, the driver goes into "web" mode, taking over the full screen of the desktop, as we normally do when running within the nanoHUB. This avoids the problem of having to edit the desktop/web setting in the driver file by hand during nanoHUB installations.

• Fixed min/max scales for curves to work better.

• Added seconds as recognized units.

File:

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

trunk/gui/scripts/curve.tcl

@@ -116 +116 @@
     set max ""
     switch -- $which {
-        x { set pos 0; set log 0 }
-        xlog { set pos 0; set log 1 }
-        y - v { set pos 1; set log 0 }
-        ylog - vlog { set pos 1; set log 1 }
+        x { set pos 0; set log 0; set axis xaxis }
+        xlog { set pos 0; set log 1; set axis xaxis }
+        y - v { set pos 1; set log 0; set axis yaxis }
+        ylog - vlog { set pos 1; set log 1; set axis yaxis }
         default {
             error "bad option \"$which\": should be x, xlog, y, ylog, v, vlog"
@@ -156 +156 @@
     }
     blt::vector destroy tmp zero
+
+    set val [$_curve get $axis.min]
+    if {"" != $val && "" != $min} {
+        if {$val > $min} {
+            # tool specified this min -- don't go any lower
+            set min $val
+        }
+    }
+
+    set val [$_curve get $axis.max]
+    if {"" != $val && "" != $max} {
+        if {$val < $max} {
+            # tool specified this max -- don't go any higher
+            set max $val
+        }
+    }
 
     return [list $min $max]