Changeset 2758 for trunk

Timestamp:

Jan 9, 2012, 1:28:43 AM (13 years ago)

Author:

ldelgass

Message:

Add volume material (diffuse/specular) and volume quality sliders. Change
default transfer function (colormap) to use cubic opacity curve.

Location:

trunk/gui/scripts

Files:

• field2dresult.tcl (modified) (2 diffs)
• vtkvolumeviewer.tcl (modified) (8 diffs)

trunk/gui/scripts/field2dresult.tcl

@@ -71 +71 @@
             puts stderr "unknown render mode \"$flags(-mode)\""
         }
-    }           
+    }
     if {"" != $servers && $flags(-mode) != "vtk"} {
         switch -- $flags(-mode) {
@@ -103 +103 @@
             #destroy $itk_component(renderer)
         }
-    } 
+    }
 
     if {![info exists itk_component(renderer)]} {

trunk/gui/scripts/vtkvolumeviewer.tcl

@@ -262 +262 @@
         cutplane-opacity        100
         volume-lighting         1
+        volume-material         80
         volume-opacity          40
+        volume-quality          50
         volume-visible          1
-        volume-wireframe        0
         legend-visible          1
     }]
@@ -995 +996 @@
     set _first ""
     InitSettings axis-xgrid axis-ygrid axis-zgrid axis-mode \
-        axis-visible axis-labels cutplane-visible \
-        cutplane-xposition cutplane-yposition cutplane-zposition \
-        cutplane-xvisible cutplane-yvisible cutplane-zvisible
+        axis-visible axis-labels
 
     SendCmd "imgflush"
@@ -1101 +1100 @@
     }
 
-    InitSettings volume-palette volume-visible 
+    InitSettings volume-palette volume-material volume-quality volume-visible \
+        cutplane-visible \
+        cutplane-xposition cutplane-yposition cutplane-zposition \
+        cutplane-xvisible cutplane-yvisible cutplane-zvisible
 
     if { $_reset } {
@@ -1364 +1366 @@
             }
         }
+        "volume-material" {
+            set val $_settings(volume-material)
+            set diffuse [expr {0.01*$val}]
+            set specular [expr {0.01*$val}]
+            #set power [expr {sqrt(160*$val+1.0)}]
+            set power [expr {$val+1.0}]
+            foreach dataset [CurrentDatasets -visible] {
+                SendCmd "volume shading diffuse $diffuse $dataset"
+                SendCmd "volume shading specular $specular $power $dataset"
+            }
+        }
         "volume-lighting" {
             set bool $_settings(volume-lighting)
             foreach dataset [CurrentDatasets -visible] {
                 SendCmd "volume lighting $bool $dataset"
+            }
+        }
+        "volume-quality" {
+            set val $_settings(volume-quality)
+            set val [expr {0.01*$val}]
+            foreach dataset [CurrentDatasets -visible] {
+                SendCmd "volume quality $val $dataset"
             }
         }
@@ -1804 +1824 @@
 
     set opaqueWmap "0.0 1.0 1.0 1.0"
-    set wmap "0.0 0.0 0.1 0.0 0.2 0.8 0.98 0.8 0.99 0.0 1.0 0.0"
+    #set wmap "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 wmap "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 } { $wmap }"
     SendCmd "colormap add $name-opaque { $cmap } { $opaqueWmap }"
@@ -1923 +1945 @@
         -font "Arial 9"
 
+    label $inner.dim_l -text "Dim" -font "Arial 9"
+    ::scale $inner.material -from 0 -to 100 -orient horizontal \
+        -variable [itcl::scope _settings(volume-material)] \
+        -width 10 \
+        -showvalue off -command [itcl::code $this AdjustSetting volume-material]
+    label $inner.bright_l -text "Bright" -font "Arial 9"
+
     label $inner.opacity_l -text "Opacity" -font "Arial 9"
     ::scale $inner.opacity -from 0 -to 100 -orient horizontal \
@@ -1929 +1958 @@
         -showvalue off \
         -command [itcl::code $this AdjustSetting volume-opacity]
+
+    label $inner.quality_l -text "Quality" -font "Arial 9"
+    ::scale $inner.quality -from 0 -to 100 -orient horizontal \
+        -variable [itcl::scope _settings(volume-quality)] \
+        -width 10 \
+        -showvalue off -command [itcl::code $this AdjustSetting volume-quality]
 
     label $inner.field_l -text "Field" -font "Arial 9" 
@@ -1964 +1999 @@
 
     blt::table $inner \
-        0,0 $inner.volume    -anchor w -pady 2 \
-        2,0 $inner.lighting  -anchor w -pady 2 \
-        6,0 $inner.field_l     -anchor w -pady 2  \
-        6,1 $inner.field       -anchor w -pady 2  \
-        7,0 $inner.palette_l   -anchor w -pady 2  \
-        7,1 $inner.palette     -anchor w -pady 2  \
+        0,0 $inner.volume    -anchor w -pady 2 -cspan 4 \
+        2,0 $inner.lighting  -anchor w -pady 2 -cspan 4 \
+        3,0 $inner.dim_l     -anchor e -pady 2 \
+        3,1 $inner.material  -fill x   -pady 2 \
+        3,2 $inner.bright_l  -anchor w -pady 2 \
+        4,0 $inner.quality_l -anchor w -pady 2 -cspan 2 \
+        5,0 $inner.quality   -fill x   -pady 2 -cspan 2 \
+        6,0 $inner.field_l   -anchor w -pady 2  \
+        6,1 $inner.field     -anchor w -pady 2 -cspan 2 \
+        7,0 $inner.palette_l -anchor w -pady 2  \
+        7,1 $inner.palette   -anchor w -pady 2 -cspan 2 \
 
     blt::table configure $inner r* c* -resize none
-    blt::table configure $inner r8 c1 -resize expand
+    blt::table configure $inner r8 c3 -resize expand
 }