Changeset 6145 for branches

Timestamp:

Mar 19, 2016 9:49:36 PM (8 years ago)

Author:

ldelgass

Message:

merge r5733 from old 1.4 branch (vtkvolumeviewer updates)

Location:

branches/1.5

Files:

• . (modified) (1 prop)
• gui/scripts/vtkvolumeviewer.tcl (modified) (22 diffs)

branches/1.5/gui/scripts/vtkvolumeviewer.tcl

@@ -3 +3 @@
 #  COMPONENT: vtkvolumeviewer - Vtk volume viewer
 #
-#  It connects to the Vtk server running on a rendering farm,
+#  This widget performs volume rendering on 3D scalar/vector datasets.
+#  It connects to the Vtkvis server running on a rendering farm,
 #  transmits data, and displays the results.
 # ======================================================================
 #  AUTHOR:  Michael McLennan, Purdue University
-#  Copyright (c) 2004-2014  HUBzero Foundation, LLC
+#  Copyright (c) 2004-2015  HUBzero Foundation, LLC
 #
 #  See the file "license.terms" for information on usage and
@@ -62 +63 @@
     public method scale {args}
 
-    private method GetDatasetsWithComponent { cname }
-
-    private variable _volcomponents   ; # Array of components found
-    private variable _componentsList   ; # List of component names
-
     # The following methods are only used by this class.
     private method AdjustSetting {what {value ""}}
@@ -72 +68 @@
     private method BuildCameraTab {}
     private method BuildColormap { name colors }
-    private method BuildCutplaneTab {}
+    private method BuildCutplanesTab {}
     private method BuildDownloadPopup { widget command }
     private method BuildViewTab {}
@@ -89 +85 @@
     private method EventuallyRotate { q }
     private method EventuallySetCutplane { axis args }
+    private method GetDatasetsWithComponent { cname }
     private method GetImage { args }
     private method GetVtkData { args }
@@ -109 +106 @@
     private method SetColormap { dataobj comp }
     private method SetLegendTip { x y }
-    private method SetObjectStyle { dataobj comp }
+    private method SetObjectStyle { dataobj cname }
     private method SetOrientation { side }
     private method Slice {option args}
@@ -126 +123 @@
     private variable _dataset2style;    # maps dataobj-component to transfunc
 
-    private variable _click;            # info used for rotate operations
-    private variable _limits;           # autoscale min/max for all axes
-    private variable _view;             # view params for 3D view
+    private variable _reset 1;          # Connection to server has been reset.
+    private variable _click;            # Info used for rotate operations.
+    private variable _limits;           # Autoscale min/max for all axes
+    private variable _view;             # View params for 3D view
     private variable _settings
     private variable _style;            # Array of current component styles.
     private variable _initialStyle;     # Array of initial component styles.
-    private variable _reset 1;          # Connection to server has been reset.
-
-    private variable _first "";         # This is the topmost dataset.
+
     private variable _start 0
     private variable _title ""
-
-    private variable _width 0
-    private variable _height 0
-    private variable _resizePending 0
-    private variable _rotatePending 0
-    private variable _cutplanePending 0
-    private variable _legendPending 0
     private variable _fields
     private variable _curFldName ""
@@ -151 +140 @@
     private variable _allowMultiComponent 0
 
+    private variable _first "";         # This is the topmost dataset.
+    private variable _volcomponents;    # Maps component name to list of
+                                        # dataobj-component tags
+    private variable _componentsList;   # List of components found
+
+    private variable _width 0
+    private variable _height 0
+    private variable _resizePending 0
+    private variable _legendPending 0
+    private variable _rotatePending 0
+    private variable _cutplanePending 0
+
     private common _downloadPopup;      # download options from popup
     private common _hardcopy
@@ -166 +167 @@
     set _serverType "vtkvis"
 
+    #DebugOn
     EnableWaitDialog 900
 
@@ -176 +178 @@
     $_dispatcher dispatch $this !resize "[itcl::code $this DoResize]; list"
 
+    # Legend event
+    $_dispatcher register !legend
+    $_dispatcher dispatch $this !legend "[itcl::code $this RequestLegend]; list"
+
     # Rotate event
     $_dispatcher register !rotate
     $_dispatcher dispatch $this !rotate "[itcl::code $this DoRotate]; list"
-
-    # Legend event
-    $_dispatcher register !legend
-    $_dispatcher dispatch $this !legend "[itcl::code $this RequestLegend]; list"
 
     # X-Cutplane event
@@ -203 +205 @@
     #
     $_parser alias image [itcl::code $this ReceiveImage]
+    $_parser alias legend [itcl::code $this ReceiveLegend]
     $_parser alias dataset [itcl::code $this ReceiveDataset]
-    $_parser alias legend [itcl::code $this ReceiveLegend]
 
     # Initialize the view to some default parameters.
     array set _view {
-        -ortho           0
-        -qw              0.853553
-        -qx              -0.353553
-        -qy              0.353553
-        -qz              0.146447
-        -xpan            0
-        -ypan            0
-        -zoom            1.0
+        -ortho    0
+        -qw       0.853553
+        -qx       -0.353553
+        -qy       0.353553
+        -qz       0.146447
+        -xpan     0
+        -ypan     0
+        -zoom     1.0
     }
     set _arcball [blt::arcball create 100 100]
@@ -294 +296 @@
     }
     pack $itk_component(reset) -side top -padx 2 -pady 2
-    Rappture::Tooltip::for $itk_component(reset) "Reset the view to the default zoom level"
+    Rappture::Tooltip::for $itk_component(reset) \
+        "Reset the view to the default zoom level"
 
     itk_component add zoomin {
@@ -346 +349 @@
         BuildViewTab
         BuildVolumeTab
-        BuildCutplaneTab
+        BuildCutplanesTab
         BuildAxisTab
         BuildCameraTab
@@ -501 +504 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::VtkVolumeViewer::add {dataobj {settings ""}} {
+    DebugTrace "Enter"
     if { ![IsValidObject $dataobj] } {
+        DebugTrace "Invalid"
         return;                         # Ignore invalid objects.
     }
@@ -542 +547 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::VtkVolumeViewer::delete {args} {
+    DebugTrace "Enter"
     if { [llength $args] == 0} {
         set args $_dlist
@@ -645 +651 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::VtkVolumeViewer::scale {args} {
+    DebugTrace "Enter"
     array unset _limits
     array unset _volcomponents
@@ -828 +835 @@
 itcl::body Rappture::VtkVolumeViewer::disconnect {} {
     Disconnect
+    set _reset 1
 }
 
@@ -981 +989 @@
         StartBufferingCommands
     }
+
     set _first ""
-
     # No volumes are active (i.e. in the working set of displayed volumes).
     # A volume is always invisible if it's not in the working set.  A
@@ -992 +1000 @@
             set _first $dataobj
         }
-        foreach comp [$dataobj components] {
-            set tag $dataobj-$comp
+        foreach cname [$dataobj components] {
+            set tag $dataobj-$cname
             if { ![info exists _datasets($tag)] } {
-                set bytes [$dataobj vtkdata $comp]
+                set bytes [$dataobj vtkdata $cname]
                 if 0 {
                     set f [open /tmp/vtkvolume.vtk "w"]
@@ -1018 +1026 @@
                 SendData $bytes
                 set _datasets($tag) 1
-                SetObjectStyle $dataobj $comp
+                SetObjectStyle $dataobj $cname
             }
             if { [info exists _obj2ovride($dataobj-raise)] } {
@@ -1586 +1594 @@
 # BuildColormap --
 #
+# Alpha map is in the format: normalized_value opacity midpoint sharpness
+#
 itcl::body Rappture::VtkVolumeViewer::BuildColormap { name styles } {
     array set style $styles
@@ -1592 +1602 @@
         set cmap "0.0 0.0 0.0 0.0 1.0 1.0 1.0 1.0"
     }
-    set max 1.0
-
+
+    set amap "0.0 0.0 0.5 0.0 1.0 1.0 0.5 0.0"
     set opaqueAmap "0.0 1.0 1.0 1.0"
-    #set amap "0.0 0.0 0.1 0.0 0.2 0.8 0.98 0.8 0.99 0.0 1.0 0.0"
-    # Approximate cubic opacity curve
-    set amap "0.0 0.0 0.1 0.001 0.2 0.008 0.3 0.027 0.4 0.064 0.5 0.125 0.6 0.216 0.7 0.343 0.8 0.512 0.9 0.729 1.0 1.0"
-    SendCmd "colormap add $name { $cmap } { $amap }"
-    SendCmd "colormap add $name-opaque { $cmap } { $opaqueAmap }"
+    SendCmd [list colormap define $name $cmap -spline $amap]
+    SendCmd [list colormap define $name-opaque $cmap $opaqueAmap]
 }
 
@@ -1883 +1890 @@
 }
 
-itcl::body Rappture::VtkVolumeViewer::BuildCutplaneTab {} {
+itcl::body Rappture::VtkVolumeViewer::BuildCutplanesTab {} {
     set font [option get $itk_component(hull) font Font]