Changeset 6237 for branches/1.6/gui

Timestamp:

Apr 3, 2016 11:48:28 AM (8 years ago)

Author:

ldelgass

Message:

merge r6235:6236 from trunk (streamlines scaling)

Location:

branches/1.6

Files:

• . (modified) (1 prop)
• gui/scripts/vtkglyphviewer.tcl (modified) (1 diff)
• gui/scripts/vtkheightmapviewer.tcl (modified) (1 diff)
• gui/scripts/vtkimageviewer.tcl (modified) (1 diff)
• gui/scripts/vtkisosurfaceviewer.tcl (modified) (2 diffs)
• gui/scripts/vtkstreamlinesviewer.tcl (modified) (9 diffs)
• gui/scripts/vtksurfaceviewer.tcl (modified) (1 diff)
• gui/scripts/vtkvolumeviewer.tcl (modified) (1 diff)

branches/1.6/gui/scripts/vtkglyphviewer.tcl

@@ -525 +525 @@
 }
 
-set rotate_delay 100
-
 itcl::body Rappture::VtkGlyphViewer::EventuallyRotate { q } {
     QuaternionToView $q
     if { !$_rotatePending } {
         set _rotatePending 1
-        global rotate_delay
-        $_dispatcher event -after $rotate_delay !rotate
+        $_dispatcher event -after 100 !rotate
     }
 }

branches/1.6/gui/scripts/vtkheightmapviewer.tcl

@@ -453 +453 @@
 }
 
-set rotate_delay 100
-
 itcl::body Rappture::VtkHeightmapViewer::EventuallyRotate { q } {
     QuaternionToView $q
     if { !$_rotatePending } {
         set _rotatePending 1
-        global rotate_delay
-        $_dispatcher event -after $rotate_delay !rotate
+        $_dispatcher event -after 100 !rotate
     }
 }

branches/1.6/gui/scripts/vtkimageviewer.tcl

@@ -443 +443 @@
 }
 
-set rotate_delay 100
-
 itcl::body Rappture::VtkImageViewer::EventuallyRotate { q } {
     QuaternionToView $q
     if { !$_rotatePending } {
         set _rotatePending 1
-        global rotate_delay
-        $_dispatcher event -after $rotate_delay !rotate
+        $_dispatcher event -after 100 !rotate
     }
 }

branches/1.6/gui/scripts/vtkisosurfaceviewer.tcl

@@ -572 +572 @@
 }
 
-set rotate_delay 100
-
 itcl::body Rappture::VtkIsosurfaceViewer::EventuallyRotate { q } {
     QuaternionToView $q
     if { !$_rotatePending } {
         set _rotatePending 1
-        global rotate_delay
-        $_dispatcher event -after $rotate_delay !rotate
+        $_dispatcher event -after 100 !rotate
     }
 }
@@ -595 +592 @@
     if { !$_contourList(updatePending) } {
         set _contourList(updatePending) 1
-        global rotate_delay
-        $_dispatcher event -after $rotate_delay !contours
+        $_dispatcher event -after 100 !contours
     }
 }

branches/1.6/gui/scripts/vtkstreamlinesviewer.tcl

@@ -76 +76 @@
     private method CurrentDatasets {args}
     private method Disconnect {}
+    private method DoRescale {}
+    private method DoReseed {}
     private method DoResize {}
-    private method DoReseed {}
     private method DoRotate {}
     private method EnterLegend { x y }
+    private method EventuallyRescale { length }
+    private method EventuallyReseed { numPoints }
     private method EventuallyResize { w h }
-    private method EventuallyReseed { numPoints }
     private method EventuallyRotate { q }
     private method EventuallySetCutplane { axis args }
@@ -136 +138 @@
     private variable _resizePending 0
     private variable _legendPending 0
+    private variable _rescalePending 0
     private variable _reseedPending 0
     private variable _rotatePending 0
@@ -142 +145 @@
     private variable _curFldName ""
     private variable _curFldLabel ""
-    private variable _field      ""
+    private variable _field ""
+    private variable _streamlinesLength 0
     private variable _numSeeds 200
     private variable _colorMode "vmag"; # Mode of colormap (vmag or scalar)
@@ -175 +179 @@
     $_dispatcher register !legend
     $_dispatcher dispatch $this !legend "[itcl::code $this RequestLegend]; list"
+
+    # Rescale streamlines event
+    $_dispatcher register !rescale
+    $_dispatcher dispatch $this !rescale "[itcl::code $this DoRescale]; list"
 
     # Reseed event
@@ -469 +477 @@
 }
 
+itcl::body Rappture::VtkStreamlinesViewer::DoRescale {} {
+    foreach dataset [CurrentDatasets -visible] {
+        SendCmd "streamlines length $_streamlinesLength $dataset"
+    }
+    set _rescalePending 0
+}
+
 itcl::body Rappture::VtkStreamlinesViewer::DoReseed {} {
     foreach dataset [CurrentDatasets -visible] {
-        foreach {dataobj comp} [split $dataset -] break
         # This command works for either random or fmesh seeds
         SendCmd "streamlines seed numpts $_numSeeds $dataset"
@@ -488 +502 @@
 }
 
+itcl::body Rappture::VtkStreamlinesViewer::EventuallyRescale { length } {
+    set _streamlinesLength $length
+    if { !$_rescalePending } {
+        set _rescalePending 1
+        $_dispatcher event -after 600 !rescale
+    }
+}
+
 itcl::body Rappture::VtkStreamlinesViewer::EventuallyReseed { numPoints } {
     set _numSeeds $numPoints
@@ -496 +518 @@
 }
 
-set rotate_delay 100
-
 itcl::body Rappture::VtkStreamlinesViewer::EventuallyRotate { q } {
     QuaternionToView $q
     if { !$_rotatePending } {
         set _rotatePending 1
-        global rotate_delay
-        $_dispatcher event -after $rotate_delay !rotate
+        $_dispatcher event -after 100 !rotate
     }
 }
@@ -1426 +1445 @@
             }
             set length [expr { $sval * ($xlen + $ylen + $zlen) } ]
-            SendCmd "streamlines length $length"
+            EventuallyRescale $length
         }
         "-streamlineslighting" {
@@ -1700 +1719 @@
         2,0 $inner.mode_l      -anchor w -pady 2  \
         2,1 $inner.mode        -fill x   -pady 2  \
-        3,0 $inner.opacity_l   -anchor w -pady 2  \
-        3,1 $inner.opacity     -fill x -pady 2 \
-        4,0 $inner.lighting    -anchor w -pady 2 -cspan 2 \
-        5,0 $inner.seeds       -anchor w -pady 2 -cspan 2 \
-        6,0 $inner.density_l   -anchor w -pady 2  \
-        6,1 $inner.density     -fill x   -pady 2  \
+        3,0 $inner.scale_l     -anchor w -pady 2  \
+        3,1 $inner.scale       -fill x   -pady 2  \
+        4,0 $inner.opacity_l   -anchor w -pady 2  \
+        4,1 $inner.opacity     -fill x -pady 2 \
+        5,0 $inner.lighting    -anchor w -pady 2 -cspan 2 \
+        6,0 $inner.seeds       -anchor w -pady 2 -cspan 2 \
+        7,0 $inner.density_l   -anchor w -pady 2  \
+        7,1 $inner.density     -fill x   -pady 2  \
 
     blt::table configure $inner r* c* -resize none
-    blt::table configure $inner r7 c1 c2 -resize expand
+    blt::table configure $inner r8 c1 c2 -resize expand
 }
 

branches/1.6/gui/scripts/vtksurfaceviewer.tcl

@@ -444 +444 @@
 }
 
-set rotate_delay 100
-
 itcl::body Rappture::VtkSurfaceViewer::EventuallyRotate { q } {
     QuaternionToView $q
     if { !$_rotatePending } {
         set _rotatePending 1
-        global rotate_delay
-        $_dispatcher event -after $rotate_delay !rotate
+        $_dispatcher event -after 100 !rotate
     }
 }

branches/1.6/gui/scripts/vtkvolumeviewer.tcl

@@ -471 +471 @@
 }
 
-set rotate_delay 100
-
 itcl::body Rappture::VtkVolumeViewer::EventuallyRotate { q } {
     QuaternionToView $q
     if { !$_rotatePending } {
         set _rotatePending 1
-        global rotate_delay
-        $_dispatcher event -after $rotate_delay !rotate
+        $_dispatcher event -after 100 !rotate
     }
 }