Changeset 3984 for trunk/gui/scripts/vtkvolumeviewer.tcl

Timestamp:

Oct 3, 2013, 10:26:53 AM (11 years ago)

Author:

gah

Message:

fix for new markers (immediately send new transfer function, don't create new marker is close to an existing marker).

File:

• trunk/gui/scripts/vtkvolumeviewer.tcl (modified) (33 diffs)

trunk/gui/scripts/vtkvolumeviewer.tcl

@@ -94 +94 @@
     protected method Disconnect {}
     protected method DoResize {}
-    protected method DoReseed {}
     protected method DoRotate {}
     protected method AdjustSetting {what {value ""}}
@@ -165 +164 @@
     private variable _height 0
     private variable _resizePending 0
-    private variable _reseedPending 0
     private variable _rotatePending 0
     private variable _cutplanePending 0
@@ -197 +195 @@
     $_dispatcher dispatch $this !resize "[itcl::code $this DoResize]; list"
 
-    # Reseed event
-    $_dispatcher register !reseed
-    $_dispatcher dispatch $this !reseed "[itcl::code $this DoReseed]; list"
-
     # Rotate event
     $_dispatcher register !rotate
@@ -212 +206 @@
     $_dispatcher register !xcutplane
     $_dispatcher dispatch $this !xcutplane \
-        "[itcl::code $this AdjustSetting cutplane-xposition]; list"
+        "[itcl::code $this AdjustSetting cutplanePositionX]; list"
 
     # Y-Cutplane event
     $_dispatcher register !ycutplane
     $_dispatcher dispatch $this !ycutplane \
-        "[itcl::code $this AdjustSetting cutplane-yposition]; list"
+        "[itcl::code $this AdjustSetting cutplanePositionY]; list"
 
     # Z-Cutplane event
     $_dispatcher register !zcutplane
     $_dispatcher dispatch $this !zcutplane \
-        "[itcl::code $this AdjustSetting cutplane-zposition]; list"
+        "[itcl::code $this AdjustSetting cutplanePositionZ]; list"
 
     #
@@ -247 +241 @@
 
     array set _settings {
-        axis-xgrid              0
-        axis-ygrid              0
-        axis-zgrid              0
         axesVisible             1
+        axisGridX               0
+        axisGridY               0
+        axisGridZ               0
         axisLabels              1
         cutplaneEdges           0
-        cutplane-xvisible       1
-        cutplane-yvisible       1
-        cutplane-zvisible       1
-        cutplane-xposition      50
-        cutplane-yposition      50
-        cutplane-zposition      50
+        cutplaneLighting        1
+        cutplaneOpacity         100
         cutplaneVisible         0
-        cutplaneLighting        1
+        cutplaneVisibleX        1
+        cutplaneVisibleY        1
+        cutplaneVisibleZ        1
         cutplaneWireframe       0
-        cutplane-opacity        100
-        volume-blendmode        composite
+        cutplaneXPosition       50
+        cutplaneYPosition       50
+        cutplaneZPosition       50
+        legendVisible           1
+        volumeAmbient           40
+        volumeBlendMode         composite
+        volumeDiffuse           60
         volumeLighting          1
-        volumeAmbient          40
-        volumeDiffuse          60
-        volumeThickness        350
-        volume-specularLevel    30
-        volume-specularExponent 90
-        volume-opacity          50
-        volume-quality          50
+        volumeOpacity           50
+        volumeQuality           50
+        volumeSpecularExponent  90
+        volumeSpecularLevel     30
+        volumeThickness         350
         volumeVisible           1
-        legendVisible           1
     }
 
@@ -851 +845 @@
         EventuallyResize $w $h
     }
+    $_dispatcher event -idle !rebuild
     return $result
 }
@@ -868 +863 @@
 itcl::body Rappture::VtkVolumeViewer::disconnect {} {
     Disconnect
-    set _reset 1
 }
 
@@ -882 +876 @@
     $_dispatcher cancel !rebuild
     $_dispatcher cancel !resize
-    $_dispatcher cancel !reseed
     $_dispatcher cancel !rotate
     $_dispatcher cancel !xcutplane
@@ -896 +889 @@
     array unset _dataset2style 
     array unset _obj2datasets 
+
+    array unset _cname2style
+    array unset _parsedFunction
+    array unset _cname2transferFunction
+
+    set _resizePending 0
+    set _rotatePending 0
+    set _cutplanePending 0
+    set _legendPending 0
+    set _reset 1
 }
 
@@ -1016 +1019 @@
         }
         DoRotate
-        InitSettings axis-xgrid axis-ygrid axis-zgrid axisFlyMode \
+        InitSettings axisGridX axisGridY axisGridZ axisFlyMode \
             axesVisible axisLabels
         PanCamera
@@ -1108 +1111 @@
 
     InitSettings volumeColormap \
-        volumeAmbient volumeDiffuse volume-specularLevel volume-specularExponent \
-        volume-opacity volume-quality volumeVisible \
+        volumeAmbient volumeDiffuse volumeSpecularLevel volumeSpecularExponent \
+        volumeOpacity volumeQuality volumeVisible \
         cutplaneVisible \
-        cutplane-xposition cutplane-yposition cutplane-zposition \
-        cutplane-xvisible cutplane-yvisible cutplane-zvisible
+        cutplanePositionX cutplanePositionY cutplanePositionZ \
+        cutplaneVisibleX cutplaneVisibleY cutplaneVisibleZ
 
     if { $_reset } {
         InitSettings volumeLighting
-        Zoom reset
+        SendCmd "camera reset"
+        SendCmd "camera zoom $_view(zoom)"
         set _reset 0
     }
@@ -1356 +1360 @@
 itcl::body Rappture::VtkVolumeViewer::AdjustSetting {what {value ""}} {
     if { ![isconnected] } {
+        if { $_reset } {
+            # Just reconnect if we've been reset.
+            Connect
+        }
         return
     }
@@ -1372 +1380 @@
             }
         }
-        "volume-blendmode" {
+        "volumeBlendMode" {
             set val [$itk_component(blendmode) value]
             set mode [$itk_component(blendmode) translate $val]
-            set _settings(volume-blendmode) $mode
+            set _settings(volumeBlendMode) $mode
             foreach dataset [CurrentDatasets -visible] {
                 SendCmd "volume blendmode $mode $dataset"
@@ -1394 +1402 @@
             }
         }
-        "volume-specularLevel" - "volume-specularExponent" {
-            set val $_settings(volume-specularLevel)
+        "volumeSpecularLevel" - "volumeSpecularExponent" {
+            set val $_settings(volumeSpecularLevel)
             set specularLevel [expr {0.01*$val}]
-            set specularExponent $_settings(volume-specularExponent)
+            set specularExponent $_settings(volumeSpecularExponent)
             foreach dataset [CurrentDatasets -visible] {
                 SendCmd "volume shading specular $specularLevel $specularExponent $dataset"
@@ -1408 +1416 @@
             }
         }
-        "volume-opacity" {
-            set val $_settings(volume-opacity)
+        "volumeOpacity" {
+            set val $_settings(volumeOpacity)
             set val [expr {0.01*$val}]
             foreach dataset [CurrentDatasets -visible] {
@@ -1415 +1423 @@
             }
         }
-        "volume-quality" {
-            set val $_settings(volume-quality)
+        "volumeQuality" {
+            set val $_settings(volumeQuality)
             set val [expr {0.01*$val}]
             foreach dataset [CurrentDatasets -visible] {
@@ -1430 +1438 @@
             SendCmd "axis labels all $bool"
         }
-        "axis-xgrid" - "axis-ygrid" - "axis-zgrid" {
-            set axis [string range $what 5 5]
+        "axisGridX" - "axisGridY" - "axisGridZ" {
+            set axis [string tolower [string range $what end end]]
             set bool $_settings($what)
             SendCmd "axis grid $axis $bool"
@@ -1465 +1473 @@
             }
         }
-        "cutplane-opacity" {
+        "cutplaneOpacity" {
             set val $_settings($what)
             set sval [expr { 0.01 * double($val) }]
@@ -1472 +1480 @@
             }
         }
-        "cutplane-xvisible" - "cutplane-yvisible" - "cutplane-zvisible" {
-            set axis [string range $what 9 9]
+        "cutplaneVisibleX" - "cutplaneVisibleY" - "cutplaneVisibleZ" {
+            set axis [string tolower [string range $what end end]]
             set bool $_settings($what)
             if { $bool } {
@@ -1486 +1494 @@
             }
         }
-        "cutplane-xposition" - "cutplane-yposition" - "cutplane-zposition" {
-            set axis [string range $what 9 9]
+        "cutplanePositionX" - "cutplanePositionY" - "cutplanePositionZ" {
+            set axis [string tolower [string range $what end end]]
             set pos [expr $_settings($what) * 0.01]
             foreach dataset [CurrentDatasets -visible] {
@@ -1623 +1631 @@
         set cmap "0.0 0.0 0.0 0.0 1.0 1.0 1.0 1.0"
     }
-    if { ![info exists _settings(volume-opacity)] } {
-        set _settings(volume-opacity) $style(-opacity)
-    }
-    set max $_settings(volume-opacity)
+    if { ![info exists _settings(volumeOpacity)] } {
+        set _settings(volumeOpacity) $style(-opacity)
+    }
+    set max $_settings(volumeOpacity)
 
     set opaqueWmap "0.0 1.0 1.0 1.0"
@@ -1706 +1714 @@
     label $inner.specularLevel_l -text "Specular" -font $font
     ::scale $inner.specularLevel -from 0 -to 100 -orient horizontal \
-        -variable [itcl::scope _settings(volume-specularLevel)] \
-        -showvalue off -command [itcl::code $this AdjustSetting volume-specularLevel] \
+        -variable [itcl::scope _settings(volumeSpecularLevel)] \
+        -showvalue off -command [itcl::code $this AdjustSetting volumeSpecularLevel] \
         -troughcolor grey92
 
     label $inner.specularExponent_l -text "Shininess" -font $font
     ::scale $inner.specularExponent -from 10 -to 128 -orient horizontal \
-        -variable [itcl::scope _settings(volume-specularExponent)] \
-        -showvalue off -command [itcl::code $this AdjustSetting volume-specularExponent] \
+        -variable [itcl::scope _settings(volumeSpecularExponent)] \
+        -showvalue off -command [itcl::code $this AdjustSetting volumeSpecularExponent] \
         -troughcolor grey92
 
     label $inner.opacity_l -text "Opacity" -font $font
     ::scale $inner.opacity -from 0 -to 100 -orient horizontal \
-        -variable [itcl::scope _settings(volume-opacity)] \
-        -showvalue off -command [itcl::code $this AdjustSetting volume-opacity] \
+        -variable [itcl::scope _settings(volumeOpacity)] \
+        -showvalue off -command [itcl::code $this AdjustSetting volumeOpacity] \
         -troughcolor grey92
 
     label $inner.quality_l -text "Quality" -font $font
     ::scale $inner.quality -from 0 -to 100 -orient horizontal \
-        -variable [itcl::scope _settings(volume-quality)] \
-        -showvalue off -command [itcl::code $this AdjustSetting volume-quality] \
+        -variable [itcl::scope _settings(volumeQuality)] \
+        -showvalue off -command [itcl::code $this AdjustSetting volumeQuality] \
         -troughcolor grey92
 
@@ -1784 +1792 @@
     $itk_component(blendmode) value "composite"
     bind $inner.blendmode <<Value>> \
-        [itcl::code $this AdjustSetting volume-blendmode]
+        [itcl::code $this AdjustSetting volumeBlendMode]
 
     blt::table $inner \
@@ -1845 +1853 @@
     checkbutton $inner.gridx \
         -text "Show X Grid" \
-        -variable [itcl::scope _settings(axis-xgrid)] \
-        -command [itcl::code $this AdjustSetting axis-xgrid] \
+        -variable [itcl::scope _settings(axisGridX)] \
+        -command [itcl::code $this AdjustSetting axisGridX] \
         -font "Arial 9"
     checkbutton $inner.gridy \
         -text "Show Y Grid" \
-        -variable [itcl::scope _settings(axis-ygrid)] \
-        -command [itcl::code $this AdjustSetting axis-ygrid] \
+        -variable [itcl::scope _settings(axisGridY)] \
+        -command [itcl::code $this AdjustSetting axisGridY] \
         -font "Arial 9"
     checkbutton $inner.gridz \
         -text "Show Z Grid" \
-        -variable [itcl::scope _settings(axis-zgrid)] \
-        -command [itcl::code $this AdjustSetting axis-zgrid] \
+        -variable [itcl::scope _settings(axisGridZ)] \
+        -command [itcl::code $this AdjustSetting axisGridZ] \
         -font "Arial 9"
 
@@ -1970 +1978 @@
     label $inner.opacity_l -text "Opacity" -font "Arial 9"
     ::scale $inner.opacity -from 0 -to 100 -orient horizontal \
-        -variable [itcl::scope _settings(cutplane-opacity)] \
+        -variable [itcl::scope _settings(cutplaneOpacity)] \
         -width 10 \
         -showvalue off \
-        -command [itcl::code $this AdjustSetting cutplane-opacity]
-    $inner.opacity set $_settings(cutplane-opacity)
+        -command [itcl::code $this AdjustSetting cutplaneOpacity]
+    $inner.opacity set $_settings(cutplaneOpacity)
 
     # X-value slicer...
@@ -1981 +1989 @@
             -onimage [Rappture::icon x-cutplane] \
             -offimage [Rappture::icon x-cutplane] \
-            -command [itcl::code $this AdjustSetting cutplane-xvisible] \
-            -variable [itcl::scope _settings(cutplane-xvisible)]
+            -command [itcl::code $this AdjustSetting cutplaneVisibleX] \
+            -variable [itcl::scope _settings(cutplaneVisibleX)]
     }
     Rappture::Tooltip::for $itk_component(xCutButton) \
@@ -1993 +2001 @@
             -borderwidth 1 -highlightthickness 0 \
             -command [itcl::code $this EventuallySetCutplane x] \
-            -variable [itcl::scope _settings(cutplane-xposition)]
+            -variable [itcl::scope _settings(cutplanePositionX)]
     } {
         usual
@@ -2009 +2017 @@
             -onimage [Rappture::icon y-cutplane] \
             -offimage [Rappture::icon y-cutplane] \
-            -command [itcl::code $this AdjustSetting cutplane-yvisible] \
-            -variable [itcl::scope _settings(cutplane-yvisible)]
+            -command [itcl::code $this AdjustSetting cutplaneVisibleY] \
+            -variable [itcl::scope _settings(cutplaneVisibleY)]
     }
     Rappture::Tooltip::for $itk_component(yCutButton) \
@@ -2021 +2029 @@
             -borderwidth 1 -highlightthickness 0 \
             -command [itcl::code $this EventuallySetCutplane y] \
-            -variable [itcl::scope _settings(cutplane-yposition)]
+            -variable [itcl::scope _settings(cutplanePositionY)]
     } {
         usual
@@ -2037 +2045 @@
             -onimage [Rappture::icon z-cutplane] \
             -offimage [Rappture::icon z-cutplane] \
-            -command [itcl::code $this AdjustSetting cutplane-zvisible] \
-            -variable [itcl::scope _settings(cutplane-zvisible)]
+            -command [itcl::code $this AdjustSetting cutplaneVisibleZ] \
+            -variable [itcl::scope _settings(cutplaneVisibleZ)]
     }
     Rappture::Tooltip::for $itk_component(zCutButton) \
@@ -2049 +2057 @@
             -borderwidth 1 -highlightthickness 0 \
             -command [itcl::code $this EventuallySetCutplane z] \
-            -variable [itcl::scope _settings(cutplane-zposition)]
+            -variable [itcl::scope _settings(cutplanePositionZ)]
     } {
         usual
@@ -2224 +2232 @@
 itcl::body Rappture::VtkVolumeViewer::ReceiveLegend { colormap title vmin vmax size } {
     set _legendPending 0
-    if { [IsConnected] } {
+    if { [isconnected] } {
         set bytes [ReceiveBytes $size]
         if { ![info exists _image(legend)] } {
@@ -2643 +2651 @@
     set _cname2transferFunction($cname) [list $cmap $wmap]
     SendCmd [list colormap add $cname $cmap $wmap]
+    SendCmd [list cutplane colormap $cname]
     EventuallyRequestLegend
 }