Changeset 1135

Timestamp:

Sep 2, 2008 1:32:34 PM (16 years ago)

Author:

gah

Message:

use different icon for switch check

Location:

trunk/gui/scripts

Files:

• booleanentry.tcl (modified) (1 diff)
• images/cboff.gif (added)
• images/cbon.gif (added)
• sequenceresult.tcl (modified) (4 diffs)
• switch.tcl (modified) (7 diffs)

trunk/gui/scripts/booleanentry.tcl

@@ -123 +123 @@
         set newval [lindex $args 0]
         $itk_component(switch) value $newval
+        event generate $itk_component(hull) <<Value>>
         return $newval
 

trunk/gui/scripts/sequenceresult.tcl

@@ -212 +212 @@
     }
     lappend _dlist $dataobj
-
     $_dispatcher event -idle !rebuild
 }
@@ -289 +288 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::SequenceResult::download {option args} {
+    if { ![winfo exists $itk_component(area).viewer] } {
+        return ""; # No data, no viewer, no download.
+    }
     switch $option {
         coming {
-            return [$itk_component(area).viewer download coming]
+            return [$itk_component(area).viewer download coming]
         }
         controls {
@@ -336 +338 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::SequenceResult::play {} {
+    if { [llength $_indices] == 0 } {
+        return;                         # No frames (i.e. no data).
+    }
     # cancel any existing animation
     pause
@@ -477 +482 @@
             }
             default {
-                error "don't know how to view sequences of $type"
+                puts stderr "don't know how to view sequences of type \"$type\""
+                puts stderr "Is the sequence empty?"
+                return
             }
         }

trunk/gui/scripts/switch.tcl

@@ -3 +3 @@
 #
 #  This widget is used to control a (boolean) on/off value.  
-# It is just a wrapper around a checkbutton.
+# It is just a wrapper around a button.
 # ======================================================================
 #  AUTHOR:  Michael McLennan, Purdue University
@@ -22 +22 @@
     public method value {args}
     public method updateText {}
+    private method _toggle {args}
     private variable _value 0  ;# value for this widget
 }
@@ -34 +35 @@
 itcl::body Rappture::Switch::constructor {args} {
 
-    itk_component add value {
-        checkbutton $itk_interior.value \
-            -variable [itcl::scope _value] \
-            -command [itcl::code $this updateText]
+    itk_component add button {
+        button $itk_interior.value \
+            -compound left \
+            -overrelief flat -relief flat -padx 3 -pady 0 -bd 0 \
+            -command [itcl::code $this _toggle]
     } {
         #rename -background -textbackground textBackground Background
     }
-    pack $itk_component(value) -side left -expand yes -fill both
+    pack $itk_component(button) -side left -expand yes -fill both
     eval itk_initialize $args 
 }
@@ -61 +63 @@
         set args [lreplace $args $i $i]
     }
-
     if {[llength $args] == 1} {
         set newval [lindex $args 0]
@@ -80 +81 @@
 }
 
+# ----------------------------------------------------------------------
+# _toggle 
+#
+#       Use internally to convert the toggled button into the
+#       proper boolean format.  Yes, right now it's hardcoded to 
+#       yes/no.  But in the future it could be some other text.
+#
+#       Can't use old "value" method because _value is already set
+#       be the widget and doesn't pass the value on the command line.
+#
+# ----------------------------------------------------------------------
+itcl::body Rappture::Switch::_toggle {} {
+    set _value [expr ($_value==0) ]
+    event generate $itk_component(hull) <<Value>>
+    updateText
+}
+
 itcl::body Rappture::Switch::updateText {} {
-    set mesg [expr {($_value) ? "on" : "off"}]
-    $itk_component(value) configure -text $mesg
+    if { $_value } {
+        $itk_component(button) configure -text "yes" \
+            -image [Rappture::icon cbon] 
+    } else {
+        $itk_component(button) configure -text "no" \
+            -image [Rappture::icon cboff] 
+    }
 }
    
@@ -90 +113 @@
 # ----------------------------------------------------------------------
 itcl::configbody Rappture::Switch::oncolor {
-    $itk_component(value) configure -selectcolor $itk_option(-oncolor) 
+    #$itk_component(button) configure -selectcolor $itk_option(-oncolor) 
 }
 
@@ -101 +124 @@
         error "bad value \"$itk_option(-state)\": should be [join $valid {, }]"
     }
-    $itk_component(value) configure -state $itk_option(-state)
+    $itk_component(button) configure -state $itk_option(-state)
 }