Changeset 1527 for trunk/gui/scripts/numberentry.tcl

Timestamp:

Jun 22, 2009, 12:38:49 PM (15 years ago)

Author:

dkearney

Message:

various code cleanups, mainly tabs. adding units ohms and amps, adding appendf interface to the simple buffer so we can append formatted strings.

File:

• trunk/gui/scripts/numberentry.tcl (modified) (10 diffs)

trunk/gui/scripts/numberentry.tcl

@@ -43 +43 @@
 itcl::body Rappture::NumberEntry::constructor {owner path args} {
     if {[catch {$owner isa Rappture::ControlOwner} valid] != 0 || !$valid} {
-        error "bad object \"$owner\": should be Rappture::ControlOwner"
+        error "bad object \"$owner\": should be Rappture::ControlOwner"
     }
     set _owner $owner
@@ -53 +53 @@
     set presets ""
     foreach pre [$_owner xml children -type preset $path] {
-        lappend presets \
-            [$_owner xml get $path.$pre.value] \
-            [$_owner xml get $path.$pre.label]
+        lappend presets \
+            [$_owner xml get $path.$pre.value] \
+            [$_owner xml get $path.$pre.label]
     }
 
@@ -61 +61 @@
     set units [$_owner xml get $path.units]
     if {$units != ""} {
-        set desc [Rappture::Units::description $units]
-        if {[string match temperature* $desc]} {
-            set class Rappture::TemperatureGauge
-        }
+        set desc [Rappture::Units::description $units]
+        if {[string match temperature* $desc]} {
+            set class Rappture::TemperatureGauge
+        }
     }
 
@@ -72 +72 @@
     #
     itk_component add gauge {
-        $class $itk_interior.gauge -units $units -presets $presets
+        $class $itk_interior.gauge -units $units -presets $presets
     }
     pack $itk_component(gauge) -expand yes -fill both
@@ -84 +84 @@
 
     if {$class == "Rappture::Gauge" && "" != $min && "" != $max} {
-        set color [$_owner xml get $path.about.color]
-        if {$color == ""} {
-            # deprecated.  Color should be in "about"
-            set color [$_owner xml get $path.color]
-        }
-        if {$color != ""}  {
-            if {$units != ""} {
-                set min [Rappture::Units::convert $min -to $units -units off]
-                set max [Rappture::Units::convert $max -to $units -units off]
-            }
-            # For compatibility. If only one color use white for min
-            if {[llength $color] == 1} {
-                set color [list $min white $max $color]
-            }
-            $itk_component(gauge) configure \
-                -spectrum [Rappture::Spectrum ::#auto $color -units $units]
-        }
+        set color [$_owner xml get $path.about.color]
+        if {$color == ""} {
+            # deprecated.  Color should be in "about"
+            set color [$_owner xml get $path.color]
+        }
+        if {$color != ""}  {
+            if {$units != ""} {
+                set min [Rappture::Units::convert $min -to $units -units off]
+                set max [Rappture::Units::convert $max -to $units -units off]
+            }
+            # For compatibility. If only one color use white for min
+            if {[llength $color] == 1} {
+                set color [list $min white $max $color]
+            }
+            $itk_component(gauge) configure \
+                -spectrum [Rappture::Spectrum ::#auto $color -units $units]
+        }
     }
 
@@ -106 +106 @@
     set str [$_owner xml get $path.about.icon]
     if {$str != ""} {
-        $itk_component(gauge) configure -image [image create photo -data $str]
+        $itk_component(gauge) configure -image [image create photo -data $str]
     }
 
@@ -131 +131 @@
     set i [lsearch -exact $args -check]
     if {$i >= 0} {
-        set onlycheck 1
-        set args [lreplace $args $i $i]
+        set onlycheck 1
+        set args [lreplace $args $i $i]
     }
 
     if {[llength $args] == 1} {
-        if {$onlycheck} {
-            # someday we may add validation...
-            return
-        }
-        set newval [lindex $args 0]
-        $itk_component(gauge) value $newval
-        return $newval
+        if {$onlycheck} {
+            # someday we may add validation...
+            return
+        }
+        set newval [lindex $args 0]
+        $itk_component(gauge) value $newval
+        return $newval
 
     } elseif {[llength $args] != 0} {
-        error "wrong # args: should be \"value ?-check? ?newval?\""
+        error "wrong # args: should be \"value ?-check? ?newval?\""
     }
 
@@ -163 +163 @@
     set label [$_owner xml get $_path.about.label]
     if {"" == $label} {
-        set label "Number"
+        set label "Number"
     }
     return $label
@@ -184 +184 @@
 
     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 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"
+        }
     }
     return [string trim $str]
@@ -218 +218 @@
     set valid {normal disabled}
     if {[lsearch -exact $valid $itk_option(-state)] < 0} {
-        error "bad value \"$itk_option(-state)\": should be [join $valid {, }]"
+        error "bad value \"$itk_option(-state)\": should be [join $valid {, }]"
     }
     $itk_component(gauge) configure -state $itk_option(-state)