Changeset 5241

Timestamp:

Apr 15, 2015 2:22:49 AM (6 years ago)

Author:

ldelgass

Message:

more backporting on vtkvolume

File:

• branches/1.3/gui/scripts/vtkvolumeviewer.tcl (modified) (8 diffs)

branches/1.3/gui/scripts/vtkvolumeviewer.tcl

@@ -220 +220 @@
         axesVisible             1
         axisLabels              1
-        cutplaneEdges           0
         cutplane-xvisible       1
         cutplane-yvisible       1
@@ -229 +228 @@
         cutplaneVisible         0
         cutplaneLighting        1
-        cutplaneWireframe       0
         cutplane-opacity        100
         volumeLighting          1
         volume-material         80
-        volume-opacity          40
+        volume-opacity          50
         volume-quality          50
         volumeVisible           1
@@ -1346 +1344 @@
             SendCmd "axis flymode $mode"
         }
-        "cutplaneEdges" {
-            set bool $_settings($what)
-            foreach dataset [CurrentDatasets -visible] {
-                SendCmd "$_cutplaneCmd edges $bool $dataset"
-            }
-        }
         "cutplaneVisible" {
             set bool $_settings($what)
             foreach dataset [CurrentDatasets -visible] {
                 SendCmd "$_cutplaneCmd visible $bool $dataset"
-            }
-        }
-        "cutplaneWireframe" {
-            set bool $_settings($what)
-            foreach dataset [CurrentDatasets -visible] {
-                SendCmd "$_cutplaneCmd wireframe $bool $dataset"
             }
         }
@@ -1718 +1704 @@
         4,3 $inner.zgrid   -anchor w \
         5,0 $inner.mode_l  -anchor w -padx { 2 0 } \
-        6,0 $inner.mode    -fill x   -cspan 3
+        5,1 $inner.mode    -fill x   -cspan 3
 
     blt::table configure $inner r* c* -resize none
@@ -1777 +1763 @@
         -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(cutplaneEdges)] \
-        -command [itcl::code $this AdjustSetting cutplaneEdges] \
         -font "Arial 9"
 
@@ -1889 +1863 @@
         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
 }
 
@@ -2009 +1981 @@
     # Parse style string.
     set tag $dataobj-$cname
-    set style [$dataobj style $cname]
-    array set settings {
-        -color \#808080
-        -edges 0
-        -edgecolor black
-        -linewidth 1.0
-        -opacity 0.4
-        -wireframe 0
-        -lighting 1
-        -visible 1
-    }
-    if { $dataobj != $_first } {
-        set settings(-opacity) 1
-    }
-    array set settings $style
-    SendCmd "volume add $tag"
+    array set style {
+        -color      BCGYR
+        -lighting   1
+        -opacity    0.5
+        -outline    0
+        -visible    1
+    }
+    array set style [$dataobj style $cname]
+    set _settings(volumeLighting) $style(-lighting)
+    set _settings(volume-opacity) [expr $style(-opacity) * 100]
+    set _settings(volumeVisible) $style(-visible)
+
+    $itk_component(palette) value $style(-color)
+
     SendCmd "$_cutplaneCmd add $tag"
     SendCmd "$_cutplaneCmd visible 0 $tag"
 
-    SendCmd "volume lighting $settings(-lighting) $tag"
-    set _settings(volumeLighting) $settings(-lighting)
+    SendCmd "volume add $tag"
+    SendCmd "volume lighting $style(-lighting) $tag"
+    SendCmd "volume opacity $style(-opacity) $tag"
+    SendCmd "volume visible $style(-visible) $tag"
+
     SetColormap $dataobj $cname
 }
@@ -2049 +2022 @@
 itcl::body Rappture::VtkVolumeViewer::ReceiveLegend { colormap title vmin vmax size } {
     set _legendPending 0
-    #puts stderr "ReceiveLegend colormap=$colormap title=$title range=$vmin,$vmax size=$size"
-    if { [IsConnected] } {
+    if { [isconnected] } {
         set bytes [ReceiveBytes $size]
         if { ![info exists _image(legend)] } {