Changeset 1725 for branches/blt4

Timestamp:

May 20, 2010, 8:27:02 AM (14 years ago)

Author:

gah

Message:

 

Location:

branches/blt4/gui/scripts

Files:

• flowvisviewer.tcl (modified) (7 diffs)
• heightmapviewer.tcl (modified) (2 diffs)
• molvisviewer.tcl (modified) (3 diffs)
• nanovisviewer.tcl (modified) (2 diffs)
• pushbutton.tcl (modified) (6 diffs)
• xyprint.tcl (modified) (6 diffs)

branches/blt4/gui/scripts/flowvisviewer.tcl

@@ -169 +169 @@
 }
 
+itk::usual TkPushbutton {
+}
+
 # ----------------------------------------------------------------------
 # CONSTRUCTOR
@@ -301 +304 @@
 
     itk_component add volume {
-        Rappture::PushButton $f.volume \
+        blt::tk::pushbutton $f.volume \
             -onimage [Rappture::icon volume-on] \
             -offimage [Rappture::icon volume-off] \
@@ -387 +390 @@
     # Play
     itk_component add play {
-        Rappture::PushButton $itk_component(flowcontrols).play \
+        blt::tk::pushbutton $itk_component(flowcontrols).play \
             -onimage [Rappture::icon flow-pause] \
             -offimage [Rappture::icon flow-play] \
@@ -399 +402 @@
     # Loop
     itk_component add loop {
-        Rappture::PushButton $itk_component(flowcontrols).loop \
+        blt::tk::pushbutton $itk_component(flowcontrols).loop \
             -onimage [Rappture::icon flow-loop] \
             -offimage [Rappture::icon flow-loop] \
@@ -2250 +2253 @@
     # X-value slicer...
     itk_component add xCutButton {
-        Rappture::PushButton $inner.xbutton \
+        blt::tk::pushbutton $inner.xbutton \
             -onimage [Rappture::icon x-cutplane] \
             -offimage [Rappture::icon x-cutplane] \
@@ -2277 +2280 @@
     # Y-value slicer...
     itk_component add yCutButton {
-        Rappture::PushButton $inner.ybutton \
+        blt::tk::pushbutton $inner.ybutton \
             -onimage [Rappture::icon y-cutplane] \
             -offimage [Rappture::icon y-cutplane] \
@@ -2304 +2307 @@
     # Z-value slicer...
     itk_component add zCutButton {
-        Rappture::PushButton $inner.zbutton \
+        blt::tk::pushbutton $inner.zbutton \
             -onimage [Rappture::icon z-cutplane] \
             -offimage [Rappture::icon z-cutplane] \

branches/blt4/gui/scripts/heightmapviewer.tcl

@@ -109 +109 @@
     keep -plotbackground -plotforeground
 }
+itk::usual TkPushbutton {
+}
 
 # ----------------------------------------------------------------------
@@ -216 +218 @@
 
     itk_component add surface {
-        Rappture::PushButton $f.surface \
+        blt::tk::pushbutton $f.surface \
             -onimage [Rappture::icon volume-on] \
             -offimage [Rappture::icon volume-off] \

branches/blt4/gui/scripts/molvisviewer.tcl

@@ -141 +141 @@
 itk::usual MolvisViewer {
     keep -background -foreground -cursor -font
+}
+itk::usual TkPushbutton {
 }
 
@@ -263 +265 @@
 
     itk_component add labels {
-        Rappture::PushButton $f.labels \
+        blt::tk::pushbutton $f.labels \
             -onimage [Rappture::icon molvis-labels-view] \
             -offimage [Rappture::icon molvis-labels-view] \
@@ -275 +277 @@
 
     itk_component add rock {
-        Rappture::PushButton $f.rock \
+        blt::tk::pushbutton $f.rock \
             -onimage [Rappture::icon molvis-rock-view] \
             -offimage [Rappture::icon molvis-rock-view] \

branches/blt4/gui/scripts/nanovisviewer.tcl

@@ -161 +161 @@
     keep -plotbackground -plotforeground
 }
+itk::usual TkPushbutton {
+}
 
 # ----------------------------------------------------------------------
@@ -267 +269 @@
 
     itk_component add volume {
-        Rappture::PushButton $f.volume \
+        blt::tk::pushbutton $f.volume \
             -onimage [Rappture::icon volume-on] \
             -offimage [Rappture::icon volume-off] \

branches/blt4/gui/scripts/pushbutton.tcl

@@ -38 +38 @@
     public method select {}
     public method toggle {}
+    public method disable {}
+    public method enable {}
 
     protected method _fixValue {args}
 
     private variable _state 0
-    public variable command "";         # Command to be invoked 
-    private variable _variable "";      # Variable to be set. 
-    public variable onimage "";         # Image displayed when selected 
-    public variable offimage "";        # Image displayed when deselected. 
-    public variable onvalue "1";        # Value set when selected.
-    public variable offvalue "0";       # Value set when deselected. 
+    private variable _enabled 1
+    public variable command "";         # Command to be invoked
+    private variable _variable "";      # Variable to be set.
+    public variable onimage "";         # Image displayed when selected
+    public variable offimage "";        # Image displayed when deselected.
+    public variable disabledimage "";   # Image displayed when deselected.
+    public variable onvalue "1";        # Value set when selected.
+    public variable offvalue "0";       # Value set when deselected.
 }
 
@@ -60 +64 @@
 itcl::body Rappture::PushButton::constructor {args} {
     itk_component add button {
-        label $itk_interior.button -borderwidth 1 -relief sunken 
+        label $itk_interior.button -borderwidth 1 -relief sunken 
     } {
-        usual
-        ignore -padx -pady -relief -borderwidth -background
+        usual
+        ignore -padx -pady -relief -borderwidth -background
     }
     bind $itk_component(button) <ButtonPress> \
@@ -72 +76 @@
 }
 
-# ----------------------------------------------------------------------
-# CONSTRUCTOR
-# ----------------------------------------------------------------------
-itcl::body Rappture::PushButton::destructor {} {
-   if {"" != $_variable} {
-        upvar #0 $_variable var
-        trace remove variable var write [itcl::code $this _fixValue]
+itcl::body Rappture::PushButton::invoke {} {
+    if { !$_enabled } {
+        puts "in invoke button not enabled"
+        return
     }
-}
-
-itcl::body Rappture::PushButton::invoke {} {
     toggle
     if { $command != "" } {
-        uplevel \#0 $command
+        uplevel \#0 $command
     }
 }
 
 itcl::body Rappture::PushButton::toggle {} {
+    if { !$_enabled } {
+        return
+    }
     set _state [expr !$_state]
     if { $_state } {
-        select
+        select
     } else {
-        deselect
+        deselect
+    }
+}
+
+itcl::body Rappture::PushButton::disable {} {
+    if { $_enabled } {
+        set _enabled [expr !$_enabled]
+        $itk_component(button) configure -relief raise \
+            -image $disabledimage -bg grey85
+    }
+}
+
+itcl::body Rappture::PushButton::enable {} {
+    if { !$_enabled } {
+        set _enabled [expr !$_enabled]
+        _fixValue
     }
 }
@@ -107 +123 @@
 itcl::body Rappture::PushButton::_fixValue {args} {
     if {"" == $itk_option(-variable)} {
-        return
+        return
     }
     upvar #0 $itk_option(-variable) var
@@ -125 +141 @@
 
 itcl::body Rappture::PushButton::select {} {
+    if { !$_enabled } {
+        return
+    }
     upvar #0 $_variable state
     set state $onvalue
@@ -130 +149 @@
 
 itcl::body Rappture::PushButton::deselect {} {
+    if { !$_enabled } {
+        return
+    }
     upvar #0 $_variable state
     set state $offvalue

branches/blt4/gui/scripts/xyprint.tcl

@@ -809 +809 @@
         "Set the size (points) of the font."
 
-    Rappture::PushButton $page.fontweight \
+    blt::tk::pushbutton $page.fontweight \
         -width 18 -height 18 \
         -onimage [Rappture::icon font-bold] \
@@ -819 +819 @@
         "Use the bold version of the font."
 
-    Rappture::PushButton $page.fontslant \
+    blt::tk::pushbutton $page.fontslant \
         -width 18 -height 18 \
         -onimage [Rappture::icon font-italic] \
@@ -962 +962 @@
         "Set the size (points) of the tick font."
 
-    Rappture::PushButton $page.tickfontweight \
+    blt::tk::pushbutton $page.tickfontweight \
         -width 18 -height 18 \
         -onimage [Rappture::icon font-bold] \
@@ -972 +972 @@
         "Use the bold version of the tick font."
 
-    Rappture::PushButton $page.tickfontslant \
+    blt::tk::pushbutton $page.tickfontslant \
         -width 18 -height 18 \
         -onimage [Rappture::icon font-italic] \
@@ -1009 +1009 @@
         "Set the size (point) of the title font."
 
-    Rappture::PushButton $page.titlefontweight \
+    blt::tk::pushbutton $page.titlefontweight \
         -width 18 -height 18 \
         -onimage [Rappture::icon font-bold] \
@@ -1019 +1019 @@
         "Use the bold version of the title font."
 
-    Rappture::PushButton $page.titlefontslant \
+    blt::tk::pushbutton $page.titlefontslant \
         -width 18 -height 18 \
         -onimage [Rappture::icon font-italic] \