Changeset 1471 for trunk/gui

Timestamp:

May 27, 2009, 6:17:22 PM (15 years ago)

Author:

gah

Message:

added dial to flowvisviewer

Location:

trunk/gui/scripts

Files:

• Makefile.in (modified) (1 diff)
• flowdial.tcl (added)
• flowvisviewer.tcl (modified) (17 diffs)

trunk/gui/scripts/Makefile.in

@@ -48 +48 @@
                 $(srcdir)/field3dresult.tcl \
                 $(srcdir)/filexfer.tcl \
+                $(srcdir)/flowdial.tcl \
                 $(srcdir)/flowhints.tcl \
                 $(srcdir)/flowvisviewer.tcl \

trunk/gui/scripts/flowvisviewer.tcl

@@ -105 +105 @@
     private method ComputeTransferFunc { tf }
     private method EventuallyResize { w h } 
+    private method EventuallyGoto { nSteps } 
     private method EventuallyResizeLegend { } 
     private method FlowCmd { dataobj comp nbytes extents }
@@ -113 +114 @@
     private method ParseMarkersOption { tf markers }
     private method WaitIcon { option widget }
-
+    private method str2millisecs { value } 
+    private method millisecs2str { value } 
+    private method IsMapped { widget } 
     private method GetFlowInfo { widget }
     private method particles { tag name } 
@@ -154 +157 @@
     private variable _resizePending 0
     private variable _resizeLegendPending 0
+    private variable _gotoPending 0
 }
 
@@ -191 +195 @@
     $_dispatcher dispatch $this !play "[itcl::code $this flow next]; list"
     
+    # Draw legend event
+    $_dispatcher register !goto
+    $_dispatcher dispatch $this !goto "[itcl::code $this flow goto2]; list"
+
     set _flow(state) 0
 
@@ -220 +228 @@
 
     array set _settings [subst {
+        $this-currenttime       0
         $this-loop              0
         $this-pan-x             $_view(pan-x)
@@ -385 +394 @@
         "Play continuously"
 
-    # Frame
-    itk_component add frame {
-        ::scale $itk_component(flowcontrols).frame -from 1 -to 100 \
-            -showvalue 0 -orient horizontal -width 14 \
-            -state disabled \
-            -variable [itcl::scope _settings($this-currenttime)]  \
-            -highlightthickness 0
-    } {
-        usual 
-        ignore -highlightthickness 
-        rename -background -controlbackground controlBackground Background
-    }
-    $itk_component(frame) set 1
-
     itk_component add dial {
-        Rappture::Radiodial $itk_component(flowcontrols).dial \
+        Rappture::Flowdial $itk_component(flowcontrols).dial \
             -length 10 -valuewidth 0 -valuepadding 0 -padding 6 \
             -linecolor "" -activelinecolor "" \
+            -min 0.0 -max 1.0 \
+            -variable [itcl::scope _settings($this-currenttime)] \
             -knobimage [Rappture::icon knob2] -knobposition center@middle
     } {
         usual
-        keep -dialprogresscolor
+        ignore -dialprogresscolor
         rename -background -controlbackground controlBackground Background
     }
-    grid $itk_component(dial) -row 1 -column 1 -sticky ew
-    bind $itk_component(dial) <<Value>> [itcl::code $this _fixValue]
-
+    $itk_component(dial) current 0.0
+    bind $itk_component(dial) <<Value>> [itcl::code $this flow goto]
     # Duration
     itk_component add duration {
@@ -461 +457 @@
         0,3 $itk_component(loop) -padx {2 0} \
         0,4 $itk_component(dial) -fill x -padx {2 0 } \
-        0,5 $itk_component(speedlabel) -padx {2 0} \
-        0,6 $itk_component(speed) -padx {2 0} \
-        0,7 $itk_component(durationlabel) -padx {2 0} \
-        0,8 $itk_component(duration) -padx { 2 3} 
+        0,5 $itk_component(duration) -padx { 0 0} \
+        0,6 $itk_component(speedlabel) -padx {2 0} \
+        0,7 $itk_component(speed) -padx {2 3} 
 
     blt::table configure $itk_component(flowcontrols) c* -resize none
@@ -2493 +2488 @@
     set _height $h
     if { !$_resizePending } {
-        $_dispatcher event -idle !resize
+        $_dispatcher event -after 200 !resize
         set _resizePending 1
     }
@@ -2502 +2497 @@
         $_dispatcher event -idle !legend
         set _resizeLegendPending 1
+    }
+}
+
+itcl::body Rappture::FlowvisViewer::EventuallyGoto { nSteps } {
+    set _flow(goto) $nSteps
+    if { !$_gotoPending } {
+        $_dispatcher event -after 1000 !goto
+        set _gotoPending 1
     }
 }
@@ -2597 +2600 @@
     set option [lindex $args 0]
     switch -- $option {
+        "goto2" {
+            puts stderr "actually sending \"flow goto $_flow(goto)\""
+            SendCmd "flow goto $_flow(goto)"
+            set _gotoPending 0
+        }
+        "goto" {
+            puts stderr "flow goto to $_settings($this-currenttime)"
+            # Figure out how many steps to the current time based upon
+            # the speed and duration.
+            set current $_settings($this-currenttime)
+            set speed [$itk_component(speed) value]
+            set time [str2millisecs $_settings($this-duration)]
+            $itk_component(dial) configure -max $time
+            set delay [expr int(round(500.0/$speed))]
+            puts stderr "duration=$time delay=$delay current=$current"
+            set timePerStep [expr {double($time) / $delay}]
+            puts stderr "timePerStep=$timePerStep"
+            set nSteps [expr {int(ceil($current/$timePerStep))}]
+            puts stderr "nSteps=$nSteps"
+            EventuallyGoto $nSteps
+        }
         "speed" {
             set speed [$itk_component(speed) value]
@@ -2602 +2626 @@
         }
         "duration" {
-            set value $_settings($this-duration)
-            set pattern1 {^ *([0-9]+):([0-5][0-9]) *$} 
-            set pattern2 {^ *:([0-5][0-9]) *$}
-            if { [string is int $value] } {
-                set _flow(duration) [expr $value * 1000]
-            } elseif { [regexp $pattern1 $value match mins secs] } {
-                set _flow(duration) [expr (($mins * 60) + $secs) * 1000]
-            } elseif { [regexp $pattern2 $value match secs] } {
-                set _flow(duration) [expr $secs * 1000]
-            } else {
+            set max [str2millisecs $_settings($this-duration)]
+            if { $max < 0 } {
                 bell
                 return
             }
-            if { $_flow(duration) > 600000 } {
-                set _flow(duration) 600000
-            }
-            set min [expr $_flow(duration) / 60000]
-            set sec [expr ($_flow(duration) - ($min*60000)) / 1000]
-            set _settings($this-duration) [format %02d:%02d $min $sec]
-            $itk_component(frame) configure -to $_flow(duration)
+            set _flow(duration) $max
+            set _settings($this-duration) [millisecs2str $max]
+            $itk_component(dial) configure -max $max
         }
         "off" {
@@ -2632 +2644 @@
             flow duration
             set _flow(state) 1
-            set _flow(time) 0
+            set _settings($this-currenttime) 0
             $itk_component(play) select
         }
@@ -2651 +2663 @@
                 flow on
                 # If we're at the end of the flow, reset the flow.
-                incr _flow(time) $_flow(delay)
-                if { $_flow(time) >= $_flow(duration) } {
+                set _settings($this-currenttime) \
+                    [expr {$_settings($this-currenttime) + $_flow(delay)}]
+                if { $_settings($this-currenttime) >= $_flow(duration) } {
                     set _settings($this-step) 1
                     SendCmd "flow reset"
@@ -2667 +2680 @@
         }
         "reset" {
-            set _flow(time) 0
             set _settings($this-currenttime) 0
             SendCmd "flow reset"
@@ -2675 +2687 @@
         }
         "next" {
-            set w $itk_component(3dview) 
-            while { $w != "" }  {
-                if { ![winfo ismapped $w] } {
-                    flow stop
-                    puts stderr "$w isn't mapped"
-                    return
-                }
-                set w [winfo parent $w]
-                if { [winfo toplevel $w] == $w } {
-                    break
-                }
+            if { ![IsMapped $itk_component(3dview)] } {
+                flow stop
+                puts stderr "$w isn't mapped"
+                return
             }
-            incr _flow(time) $_flow(delay)
-            if { $_flow(time) >= $_flow(duration) } {
+            set _settings($this-currenttime) \
+                [expr {$_settings($this-currenttime) + $_flow(delay)}]
+            if { $_settings($this-currenttime) >= $_flow(duration) } {
                 if { !$_settings($this-loop) } {
                     flow off
@@ -2697 +2703 @@
                 SendCmd "flow next"
             }
-            set _settings($this-currenttime) $_flow(time)
             $_dispatcher event -after $_flow(delay) !play
         } 
@@ -2788 +2793 @@
 }
 
+itcl::body Rappture::FlowvisViewer::str2millisecs { value } {
+    set pattern1 {^ *([0-9]+):([0-5][0-9]) *$} 
+    set pattern2 {^ *:([0-5][0-9]) *$}
+    if { [string is int $value] } {
+        return [expr $value * 1000.0]
+    } elseif { [regexp $pattern1 $value match mins secs] } {
+        return [expr (($mins * 60) + $secs) * 1000.0]
+    } elseif { [regexp $pattern2 $value match secs] } {
+        return [expr $secs * 1000.0]
+    } else {
+        return -1
+    }
+}
+
+itcl::body Rappture::FlowvisViewer::millisecs2str { value } {
+    set min [expr floor($value / 60000.0)]
+    set sec [expr ($value - ($min*60000.0)) / 1000.0]
+    puts stderr "min=$min sec=$sec"
+    return [format %02d:%02d [expr round($min)] [expr round($sec)]]
+}
+
+itcl::body Rappture::FlowvisViewer::IsMapped { w } {
+    while { $w != "" }  {
+        if { ![winfo ismapped $w] } {
+            return 0
+        }
+        set w [winfo parent $w]
+        if { [winfo toplevel $w] == $w } {
+            break
+        }
+    }
+    return 1
+}