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

Timestamp:

Feb 26, 2014 11:08:22 AM (10 years ago)

Author:

ldelgass

Message:

VTK volume viewer fixes. Still needs work for multiple components vs. multiple
fields.

File:

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

trunk/gui/scripts/vtkvolumeviewer.tcl

@@ -250 +250 @@
         -axislabelsvisible              1
         -background                     black
-        -cutplaneedgesvisible           0
         -cutplanelighting               1
         -cutplaneopacity                100
         -cutplanesvisible               0
-        -cutplanewireframe              0
         -legendvisible                  1
         -volumeambient                  40
@@ -1373 +1371 @@
     }
     switch -- $what {
+        "-current" {
+            set cname [$itk_component(volcomponents) value]
+            SwitchComponent $cname
+        }
         "-background" {
             set bgcolor [$itk_component(background) value]
@@ -1438 +1440 @@
         }
         "-volumeambient" {
+            # Other parts of the code use the -volumeambient setting to
+            # tell if the component settings have been initialized
+            if { ![info exists _settings($_current${what})] } {
+                InitComponentSettings $_current
+            }
             set val $_settings(${what})
             set _settings($_current${what}) $val
@@ -1503 +1510 @@
             set _settings(${what}) $mode
             SendCmd "axis flymode $mode"
-        }
-        "-cutplaneedgesvisible" {
-            set bool $_settings(${what})
-            foreach dataset [CurrentDatasets -visible] {
-                if {$_cutplaneCmd != "imgcutplane"} {
-                    SendCmd "$_cutplaneCmd edges $bool $dataset"
-                }
-            }
-        }
-        "-cutplanewireframe" {
-            set bool $_settings(${what})
-            foreach dataset [CurrentDatasets -visible] {
-                if {$_cutplaneCmd != "imgcutplane"} {
-                    SendCmd "$_cutplaneCmd wireframe $bool $dataset"
-                }
-            }
         }
         "-cutplanesvisible" {
@@ -1913 +1904 @@
     checkbutton $inner.labels \
         -text "Show Axis Labels" \
-        -variable [itcl::scope _settings(-axislabelsvisiboe)] \
+        -variable [itcl::scope _settings(-axislabelsvisible)] \
         -command [itcl::code $this AdjustSetting -axislabelsvisible] \
         -font "Arial 9"
@@ -2024 +2015 @@
         -font "Arial 9"
 
-    checkbutton $inner.wireframe \
-        -text "Show Wireframe" \
-        -variable [itcl::scope _settings(-cutplanewireframe)] \
-        -command [itcl::code $this AdjustSetting -cutplanewireframe] \
-        -font "Arial 9"
-
     checkbutton $inner.lighting \
         -text "Enable Lighting" \
         -variable [itcl::scope _settings(-cutplanelighting)] \
         -command [itcl::code $this AdjustSetting -cutplanelighting] \
-        -font "Arial 9"
-
-    checkbutton $inner.edges \
-        -text "Show Edges" \
-        -variable [itcl::scope _settings(-cutplaneedgesvisible)] \
-        -command [itcl::code $this AdjustSetting -cutplaneedgesvisible] \
         -font "Arial 9"
 
@@ -2136 +2115 @@
         0,0 $inner.visible              -anchor w -pady 2 -cspan 4 \
         1,0 $inner.lighting             -anchor w -pady 2 -cspan 4 \
-        2,0 $inner.wireframe            -anchor w -pady 2 -cspan 4 \
-        3,0 $inner.edges                -anchor w -pady 2 -cspan 4 \
-        4,0 $inner.opacity_l            -anchor w -pady 2 -cspan 3 \
-        5,0 $inner.opacity              -fill x   -pady 2 -cspan 3 \
-        6,0 $itk_component(xCutButton)  -anchor e -padx 2 -pady 2 \
-        7,0 $itk_component(xCutScale)   -fill y \
-        6,1 $itk_component(yCutButton)  -anchor e -padx 2 -pady 2 \
-        7,1 $itk_component(yCutScale)   -fill y \
-        6,2 $itk_component(zCutButton)  -anchor e -padx 2 -pady 2 \
-        7,2 $itk_component(zCutScale)   -fill y \
+        2,0 $inner.opacity_l            -anchor w -pady 2 -cspan 3 \
+        3,0 $inner.opacity              -fill x   -pady 2 -cspan 3 \
+        4,0 $itk_component(xCutButton)  -anchor e -padx 2 -pady 2 \
+        5,0 $itk_component(xCutScale)   -fill y \
+        4,1 $itk_component(yCutButton)  -anchor e -padx 2 -pady 2 \
+        5,1 $itk_component(yCutScale)   -fill y \
+        4,2 $itk_component(zCutButton)  -anchor e -padx 2 -pady 2 \
+        5,2 $itk_component(zCutScale)   -fill y \
 
     blt::table configure $inner r* c* -resize none
-    blt::table configure $inner r7 c3 -resize expand
+    blt::table configure $inner r5 c3 -resize expand
 }
 
@@ -2259 +2236 @@
         -color BCGYR
         -volumelighting         1
-        -volumelinewidth        1.0
         -volumeoutline          0
         -volumevisible          1
-    }
-    if { $dataobj != $_first } {
-        set style(-opacity) 1
     }
     array set styles [$dataobj style $cname]
@@ -2675 +2648 @@
             -color BCGYR
             -levels 6
-            -opacity 1.0
             -markers ""
         }
@@ -2685 +2657 @@
         }
         set _settings($cname-color) $styles(-color)
-        set _settings($cname-volumeopacity) $styles(-opacity)
         set cmap [ColorsToColormap $styles(-color)]
         set _cname2defaultcolormap($cname) $cmap
@@ -2789 +2760 @@
     array set _settings [subst {
         $cname-color                    default
-        $cname-light2side               1
-        $cname-volumeoutline            0
         $cname-volumeambient            40
         $cname-volumeblendmode          composite
         $cname-volumediffuse            60
+        $cname-volumelight2side         1
         $cname-volumelighting           1
         $cname-volumeopacity            50
+        $cname-volumeoutline            0
         $cname-volumequality            80
         $cname-volumespecularexponent   90
@@ -2817 +2788 @@
     # _settings variables change widgets, except for colormap
     foreach name {
-        -volumelight2side              
-        -volumeoutline                 
-        -volumeambient           
-        -volumeblendmode         
-        -volumediffuse           
-        -volumelighting          
-        -volumeopacity           
-        -volumequality           
-        -volumespecularexponent  
-        -volumespecularlevel     
-        -volumethickness         
-        -volumevisible           
+        -volumeambient
+        -volumeblendmode
+        -volumediffuse
+        -volumelight2side
+        -volumelighting
+        -volumeopacity
+        -volumeoutline
+        -volumequality
+        -volumespecularexponent
+        -volumespecularlevel
+        -volumethickness
+        -volumevisible
     } {
-        set _settings($name) $_settings(${cname}-${name})
+        set _settings($name) $_settings(${cname}${name})
     }
     $itk_component(colormap) value        $_settings($cname-color)
@@ -2843 +2814 @@
         InitComponentSettings $cname
     }
-    set max 1.0 ;                       #$_settings($tag-opacity)
 
     set isovalues [$_transferFunctionEditors($cname) values]
 
-    # Ensure that the global opacity and thickness settings (in the slider
-    # settings widgets) are used for the active transfer-function.  Update
-    # the values in the _settings varible.
-    set opacity [expr { double($_settings($cname-volumeopacity)) * 0.01 }]
-
+    # Currently using volume opacity to scale opacity in
+    # the volume shader. The transfer function always sets full
+    # opacity
+    set max 1.0;
+
+    # Use the component-wise thickness setting from the slider
+    # settings widget
     # Scale values between 0.00001 and 0.01000
     set delta [expr {double($_settings($cname-volumethickness)) * 0.0001}]