Changeset 5239 for branches

Timestamp:

Apr 15, 2015 1:54:57 AM (9 years ago)

Author:

ldelgass

Message:

more backporting on vtkvolume

File:

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

branches/1.3/gui/scripts/vtkvolumeviewer.tcl

@@ -785 +785 @@
 itcl::body Rappture::VtkVolumeViewer::disconnect {} {
     Disconnect
+    set _reset 1
 }
 
@@ -942 +943 @@
     set _first ""
 
-    SendCmd "dataset visible 0"
-
     # 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
     # volume in the working set may be visible/invisible depending upon the
     # global visibility value.
+    SendCmd "dataset visible 0"
     foreach dataobj [get -objects] {
         if { [info exists _obj2ovride($dataobj-raise)] &&  $_first == "" } {
@@ -1362 +1362 @@
             set bool $_settings($what)
             foreach dataset [CurrentDatasets -visible] {
-                SendCmd "$_cutplaneCmd 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"
+                }
             }
         }
@@ -1393 +1404 @@
             }
             set _cutplanePending 0
-        }
-        "volume-palette" {
-            set palette [$itk_component(palette) value]
-            set _settings(volume-palette) $palette
-            foreach dataset [CurrentDatasets -visible $_first] {
-                foreach {dataobj comp} [split $dataset -] break
-                ChangeColormap $dataobj $comp $palette
-            }
-            set _legendPending 1
         }
         "volume-palette" {
@@ -1648 +1650 @@
 
 itcl::body Rappture::VtkVolumeViewer::BuildAxisTab {} {
-
     set fg [option get $itk_component(hull) font Font]
     #set bfg [option get $itk_component(hull) boldFont Font]
@@ -1654 +1655 @@
     set inner [$itk_component(main) insert end \
         -title "Axis Settings" \
-        -icon [Rappture::icon axis1]]
+        -icon [Rappture::icon axis2]]
     $inner configure -borderwidth 4
 
     checkbutton $inner.visible \
-        -text "Show Axes" \
+        -text "Axes" \
         -variable [itcl::scope _settings(axesVisible)] \
         -command [itcl::code $this AdjustSetting axesVisible] \
@@ -1664 +1665 @@
 
     checkbutton $inner.labels \
-        -text "Show Axis Labels" \
+        -text "Axis Labels" \
         -variable [itcl::scope _settings(axisLabels)] \
         -command [itcl::code $this AdjustSetting axisLabels] \
         -font "Arial 9"
-
-    checkbutton $inner.gridx \
-        -text "Show X Grid" \
+    label $inner.grid_l -text "Grid" -font "Arial 9"
+    checkbutton $inner.xgrid \
+        -text "X" \
         -variable [itcl::scope _settings(axis-xgrid)] \
         -command [itcl::code $this AdjustSetting axis-xgrid] \
         -font "Arial 9"
-    checkbutton $inner.gridy \
-        -text "Show Y Grid" \
+    checkbutton $inner.ygrid \
+        -text "Y" \
         -variable [itcl::scope _settings(axis-ygrid)] \
         -command [itcl::code $this AdjustSetting axis-ygrid] \
         -font "Arial 9"
-    checkbutton $inner.gridz \
-        -text "Show Z Grid" \
+    checkbutton $inner.zgrid \
+        -text "Z" \
         -variable [itcl::scope _settings(axis-zgrid)] \
         -command [itcl::code $this AdjustSetting axis-zgrid] \
@@ -1699 +1700 @@
 
     blt::table $inner \
-        0,0 $inner.visible -anchor w -cspan 2 \
-        1,0 $inner.labels  -anchor w -cspan 2 \
-        2,0 $inner.gridx   -anchor w -cspan 2 \
-        3,0 $inner.gridy   -anchor w -cspan 2 \
-        4,0 $inner.gridz   -anchor w -cspan 2 \
-        5,0 $inner.mode_l  -anchor w -cspan 2 -padx { 2 0 } \
-        6,0 $inner.mode    -fill x   -cspan 2
+        0,0 $inner.visible -anchor w -cspan 4 \
+        1,0 $inner.labels  -anchor w -cspan 4 \
+        2,0 $inner.minorticks  -anchor w -cspan 4 \
+        4,0 $inner.grid_l  -anchor w \
+        4,1 $inner.xgrid   -anchor w \
+        4,2 $inner.ygrid   -anchor w \
+        4,3 $inner.zgrid   -anchor w \
+        5,0 $inner.mode_l  -anchor w -padx { 2 0 } \
+        6,0 $inner.mode    -fill x   -cspan 3
 
     blt::table configure $inner r* c* -resize none
-    blt::table configure $inner r7 c1 -resize expand
+    blt::table configure $inner r7 c6 -resize expand
+    blt::table configure $inner r3 -height 0.125i
 }
 
@@ -1992 +1996 @@
 }
 
-itcl::body Rappture::VtkVolumeViewer::SetObjectStyle { dataobj comp } {
+itcl::body Rappture::VtkVolumeViewer::SetObjectStyle { dataobj cname } {
     # Parse style string.
-    set tag $dataobj-$comp
-    set style [$dataobj style $comp]
+    set tag $dataobj-$cname
+    set style [$dataobj style $cname]
     array set settings {
         -color \#808080
@@ -2016 +2020 @@
     SendCmd "volume lighting $settings(-lighting) $tag"
     set _settings(volumeLighting) $settings(-lighting)
-    SetColormap $dataobj $comp
+    SetColormap $dataobj $cname
 }
 
@@ -2190 +2194 @@
 }
 
-
 # ----------------------------------------------------------------------
 # USAGE: Slice move x|y|z <newval>
@@ -2220 +2223 @@
     }
 }
-
 
 # ----------------------------------------------------------------------