Changeset 56 for trunk/gui/scripts

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.

Location:

trunk/gui/scripts

Files:

• booleanentry.tcl (modified) (1 diff)
• curve.tcl (modified) (2 diffs)
• units.tcl (modified) (1 diff)
• xyresult.tcl (modified) (2 diffs)

trunk/gui/scripts/booleanentry.tcl

@@ -135 +135 @@
 itcl::body Rappture::BooleanEntry::tooltip {} {
     set str [$_owner xml get $_path.about.description]
-
-    set units [$_owner xml get $_path.units]
-    set min [$_owner xml get $_path.min]
-    set max [$_owner xml get $_path.max]
-
-    if {$units != "" || $min != "" || $max != ""} {
-        append str "\n\nEnter a number"
-
-        if {$min != "" && $max != ""} {
-            append str " between $min and $max"
-        } elseif {$min != ""} {
-            append str " greater than $min"
-        } elseif {$max != ""} {
-            append str " less than $max"
-        }
-
-        if {$units != ""} {
-            set desc [Rappture::Units::description $units]
-            append str " with units of $desc"
-        }
-    }
+    append str "\n\nEnter a boolean value (1/0, on/off, yes/no, true/false)"
     return [string trim $str]
 }

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]

trunk/gui/scripts/units.tcl

@@ -478 +478 @@
 
 Rappture::Units::define V -type voltage -metric yes
+
+Rappture::Units::define s -type seconds -metric yes

trunk/gui/scripts/xyresult.tcl

@@ -553 +553 @@
             set min $_xmin
             set max $_xmax
-            if {$min > 0} {
-                set min [expr {0.95*$min}]
-            } else {
-                set min [expr {1.05*$min}]
-            }
-            if {$max > 0} {
-                set max [expr {1.05*$max}]
-            } else {
-                set max [expr {0.95*$max}]
-            }
         }
         if {$min != $max} {
@@ -579 +569 @@
             set max $_vlogmax
             if {$min == $max} {
-                set min [expr {0.9*$min}]
-                set max [expr {1.1*$max}]
-            }
-            set v [expr {floor(log10($min))}]
-            if {$v > 0} {
-                set min [expr {pow(10.0,$v)}]
-            }
-            set v [expr {floor(log10($max))}]
-            if {$v > 0} {
-                set max [expr {pow(10.0,$v)}]
+                set logmin [expr {floor(log10(abs(0.9*$min)))}]
+                set logmax [expr {ceil(log10(abs(1.1*$max)))}]
+            } else {
+                # add a little padding
+                set logmin [expr {floor(log10(abs($min)))}]
+                set logmax [expr {ceil(log10(abs($max)))}]
+                set delta [expr {$logmax-$logmin}]
+                set logmin [expr {$logmin-0.05*$delta}]
+                set logmax [expr {$logmax+0.05*$delta}]
+            }
+            if {$logmin < -300} {
+                set min 1e-300
+            } elseif {$logmin > 300} {
+                set min 1e+300
+            } else {
+                set min [expr {pow(10.0,$logmin)}]
+            }
+
+            if {$logmax < -300} {
+                set max 1e-300
+            } elseif {$logmax > 300} {
+                set max 1e+300
+            } else {
+                set max [expr {pow(10.0,$logmax)}]
             }
         } else {
             set min $_vmin
             set max $_vmax
-            if {$min > 0} {
-                set min [expr {0.95*$min}]
-            } else {
-                set min [expr {1.05*$min}]
-            }
-            if {$max > 0} {
-                set max [expr {1.05*$max}]
-            } else {
-                set max [expr {0.95*$max}]
-            }
+            set delta [expr {$max-$min}]
+            set min [expr {$min-0.05*$delta}]
+            set max [expr {$max+0.05*$delta}]
         }
         if {$min != $max} {