Changeset 4083 for trunk/gui

Timestamp:

Dec 17, 2013 12:20:28 PM (10 years ago)

Author:

ldelgass

Message:

Use image cutplanes (3D texture reslicing) in VTK volume viewer (requires
uniform grid).

File:

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

trunk/gui/scripts/vtkvolumeviewer.tcl

@@ -167 +167 @@
     private variable _curFldName ""
     private variable _curFldLabel ""
-    private variable _colorMode "scalar";#  Mode of colormap (vmag or scalar)
+    private variable _cutplaneCmd "imgcutplane"
 }
 
@@ -1456 +1456 @@
             set bool $_settings($what)
             foreach dataset [CurrentDatasets -visible] {
-                SendCmd "cutplane edges $bool $dataset"
+                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"
+                }
             }
         }
@@ -1462 +1472 @@
             set bool $_settings($what)
             foreach dataset [CurrentDatasets -visible] {
-                SendCmd "cutplane visible $bool $dataset"
-            }
-        }
-        "cutplaneWireframe" {
-            set bool $_settings($what)
-            foreach dataset [CurrentDatasets -visible] {
-                SendCmd "cutplane wireframe $bool $dataset"
+                SendCmd "$_cutplaneCmd visible $bool $dataset"
             }
         }
@@ -1474 +1478 @@
             set bool $_settings($what)
             foreach dataset [CurrentDatasets -visible] {
-                SendCmd "cutplane lighting $bool $dataset"
+                if {$_cutplaneCmd != "imgcutplane"} {
+                    SendCmd "$_cutplaneCmd lighting $bool $dataset"
+                } else {
+                    if {$bool} {
+                        set ambient 0.0
+                        set diffuse 1.0
+                    } else {
+                        set ambient 1.0
+                        set diffuse 0.0
+                    }
+                    SendCmd "imgcutplane material $ambient $diffuse $dataset"
+                }
             }
         }
@@ -1481 +1496 @@
             set sval [expr { 0.01 * double($val) }]
             foreach dataset [CurrentDatasets -visible] {
-                SendCmd "cutplane opacity $sval $dataset"
+                SendCmd "$_cutplaneCmd opacity $sval $dataset"
             }
         }
@@ -1495 +1510 @@
             }
             foreach dataset [CurrentDatasets -visible] {
-                SendCmd "cutplane axis $axis $bool $dataset"
+                SendCmd "$_cutplaneCmd axis $axis $bool $dataset"
             }
         }
@@ -1502 +1517 @@
             set pos [expr $_settings($what) * 0.01]
             foreach dataset [CurrentDatasets -visible] {
-                SendCmd "cutplane slice ${axis} ${pos} $dataset"
+                SendCmd "$_cutplaneCmd slice ${axis} ${pos} $dataset"
             }
             set _cutplanePending 0
@@ -1526 +1541 @@
                     puts stderr "Can't use a vector field in a volume"
                     return
-                } else {
-                    set _colorMode scalar
                 }
                 set _curFldName $fname
@@ -1536 +1549 @@
             }
             foreach dataset [CurrentDatasets -visible $_first] {
-                #SendCmd "volume colormode $_colorMode ${fname} $dataset"
-                SendCmd "cutplane colormode $_colorMode ${fname} $dataset"
+                SendCmd "dataset scalar $_curFldName $dataset"
             }
             SendCmd "camera reset"
@@ -1568 +1580 @@
         if { [info exists _dataset2style($dataset)] } {
             SendCmdNoWait \
-                "legend $_dataset2style($dataset) $_colorMode $_curFldName {} $w $h 0"
+                "legend $_dataset2style($dataset) scalar $_curFldName {} $w $h 0"
             break;
         }
@@ -2138 +2150 @@
     array set settings $style
     SendCmd "volume add $tag"
-    SendCmd "cutplane add $tag"
-    SendCmd "cutplane visible 0 $tag"
+    SendCmd "$_cutplaneCmd add $tag"
+    SendCmd "$_cutplaneCmd visible 0 $tag"
     SendCmd "volume lighting $settings(-lighting) $tag"
     set _settings(volumeLighting) $settings(-lighting)
     SetInitialTransferFunction $dataobj $cname
     SendCmd "volume colormap $cname $tag"
-    SendCmd "cutplane colormap $cname-opaque $tag"
+    SendCmd "$_cutplaneCmd colormap $cname-opaque $tag"
 }