Changeset 5278

Timestamp:

Apr 18, 2015, 4:13:45 AM (5 years ago)

Author:

ldelgass

Message:

merge r5276 from trunk

Location:

branches/1.4

Files:

• . (modified) (1 prop)
• gui/scripts/flowvisviewer.tcl (modified) (7 diffs)

branches/1.4/gui/scripts/flowvisviewer.tcl

@@ -6 +6 @@
 # It connects to the Flowvis server running on a rendering farm, transmits
 # data, and displays the results.
-#
 # ======================================================================
 #  AUTHOR:  Michael McLennan, Purdue University
@@ -70 +69 @@
     public method scale {args}
     public method updateTransferFunctions {}
-
-    # soon to be removed.
-    private method Flow {option args}
-    private method Play {}
-    private method Pause {}
 
     # The following methods are only used by this class.
@@ -445 +439 @@
         "Set duration of flow (format is min:sec)"
 
-
     itk_component add durationlabel {
         label $itk_component(flowcontrols).durationl \
@@ -1225 +1218 @@
     }
 
-
     # sync the state of slicers
     set vols [CurrentVolumeIds -cutplanes]
@@ -1425 +1417 @@
         $itk_component(3dview) configure -cursor ""
     }
-}
-
-
-# ----------------------------------------------------------------------
-# USAGE: Flow movie record|stop|play ?on|off|toggle?
-#
-# Called when the user clicks on the record, stop or play buttons
-# for flow visualization.
-# ----------------------------------------------------------------------
-itcl::body Rappture::FlowvisViewer::Flow {option args} {
-    switch -- $option {
-        movie {
-            if {[llength $args] < 1 || [llength $args] > 2} {
-                error "wrong # args: should be \"Flow movie record|stop|play ?on|off|toggle?\""
-            }
-            set action [lindex $args 0]
-            set op [lindex $args 1]
-            if {$op == ""} { set op "on" }
-
-            set current [State $action]
-            if {$op == "toggle"} {
-                if {$current == "on"} {
-                    set op "off"
-                } else {
-                    set op "on"
-                }
-            }
-            set cmds ""
-            switch -- $action {
-                record {
-                    if { [$itk_component(rewind) cget -relief] != "sunken" } {
-                        $itk_component(rewind) configure -relief sunken
-                        $itk_component(stop) configure -relief raised
-                        $itk_component(play) configure -relief raised
-                        set inner $itk_component(settingsFrame)
-                        set frames [$inner.framecnt value]
-                        set _settings(nsteps) $frames
-                        set cmds "flow capture $frames"
-                        SendCmd $cmds
-                    }
-                }
-                stop {
-                    if { [$itk_component(stop) cget -relief] != "sunken" } {
-                        $itk_component(rewind) configure -relief raised
-                        $itk_component(stop) configure -relief sunken
-                        $itk_component(play) configure -relief raised
-                        _pause
-                        set cmds "flow reset"
-                        SendCmd $cmds
-                    }
-                }
-                play {
-                    if { [$itk_component(play) cget -relief] != "sunken" } {
-                        $itk_component(rewind) configure -relief raised
-                        $itk_component(stop) configure -relief raised
-                        $itk_component(play) configure \
-                            -image [Rappture::icon flow-pause] \
-                            -relief sunken
-                        bind $itk_component(play) <ButtonPress> \
-                            [itcl::code $this _pause]
-                        flow next
-                    }
-                }
-                default {
-                    error "bad option \"$option\": should be one of record|stop|play"
-                }
-
-            }
-        }
-        default {
-            error "bad option \"$option\": should be movie"
-        }
-    }
-}
-
-# ----------------------------------------------------------------------
-# USAGE: Play
-#
-# ----------------------------------------------------------------------
-itcl::body Rappture::FlowvisViewer::Play {} {
-    SendCmd "flow next"
-    set delay [expr {int(ceil(pow($_settings(speed)/10.0+2,2.0)*15))}]
-    $_dispatcher event -after $delay !play
-}
-
-# ----------------------------------------------------------------------
-# USAGE: Pause
-#
-# Invoked when the user hits the "pause" button to stop playing the
-# current sequence of frames as a movie.
-# ----------------------------------------------------------------------
-itcl::body Rappture::FlowvisViewer::Pause {} {
-    $_dispatcher cancel !play
-
-    # Toggle the button to "play" mode
-    $itk_component(play) configure \
-        -image [Rappture::icon flow-start] \
-        -relief raised
-    bind $itk_component(play) <ButtonPress> \
-        [itcl::code $this Flow movie play toggle]
 }
 
@@ -2602 +2494 @@
 }
 
-
 #
 # flow --
@@ -2746 +2637 @@
 }
 
-itcl::body Rappture::FlowvisViewer::GetPngImage  { widget width height } {
+itcl::body Rappture::FlowvisViewer::GetPngImage { widget width height } {
     set token "print[incr _nextToken]"
     set var ::Rappture::FlowvisViewer::_hardcopy($this-$token)