Changeset 4216 for branches/1.3

Timestamp:

Mar 11, 2014 8:18:02 AM (10 years ago)

Author:

ldelgass

Message:

merge r3896 from trunk

Location:

branches/1.3

Files:

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

branches/1.3/gui/scripts/vtkvolumeviewer.tcl

@@ -219 +219 @@
         axis-ygrid              0
         axis-zgrid              0
-        axis-xcutplane          0
-        axis-ycutplane          0
-        axis-zcutplane          0
-        axis-xposition          0
-        axis-yposition          0
-        axis-zposition          0
         axesVisible             1
         axisLabels              1
         cutplaneEdges           0
-        cutplane-xvisible       0
-        cutplane-yvisible       0
-        cutplane-zvisible       0
+        cutplane-xvisible       1
+        cutplane-yvisible       1
+        cutplane-zvisible       1
         cutplane-xposition      50
         cutplane-yposition      50
         cutplane-zposition      50
-        cutplaneVisible         1
+        cutplaneVisible         0
         cutplaneLighting        1
         cutplaneWireframe       0
@@ -337 +331 @@
             -command [itcl::code $this AdjustSetting cutplaneVisible] 
     }
-    $itk_component(cutplane) select
     Rappture::Tooltip::for $itk_component(cutplane) \
         "Show/Hide cutplanes"
@@ -1019 +1012 @@
                 foreach { label units components } \
                     [$_first fieldinfo $fname] break
-                $itk_component(field) choices insert end "$fname" "$label"
-                $itk_component(fieldmenu) add radiobutton -label "$label" \
-                    -value $label -variable [itcl::scope _curFldLabel] \
-                    -selectcolor red \
-                    -activebackground $itk_option(-plotbackground) \
-                    -activeforeground $itk_option(-plotforeground) \
-                    -font "Arial 8" \
-                    -command [itcl::code $this Combo invoke]
-                set _fields($fname) [list $label $units $components]
-                if { $_curFldName == "" } {
-                    set _curFldName $fname
-                    set _curFldLabel $label
+                # Only scalar fields are valid
+                if {$components == 1} {
+                    $itk_component(field) choices insert end "$fname" "$label"
+                    $itk_component(fieldmenu) add radiobutton -label "$label" \
+                        -value $label -variable [itcl::scope _curFldLabel] \
+                        -selectcolor red \
+                        -activebackground $itk_option(-plotbackground) \
+                        -activeforeground $itk_option(-plotforeground) \
+                        -font "Arial 8" \
+                        -command [itcl::code $this Combo invoke]
+                    set _fields($fname) [list $label $units $components]
+                    if { $_curFldName == "" } {
+                        set _curFldName $fname
+                        set _curFldLabel $label
+                    }
                 }
             }
@@ -1421 +1417 @@
                 foreach { label units components } $_fields($fname) break
                 if { $components > 1 } {
-                    set _colorMode vmag
+                    puts stderr "Can't use a vector field in a volume"
+                    return
                 } else {
                     set _colorMode scalar
@@ -1431 +1428 @@
                 return
             }
-            SendCmd "volume colormode $_colorMode ${name} $dataset"
-            SendCmd "cutplane colormode $_colorMode ${name} $dataset"
+            foreach dataset [CurrentDatasets -visible $_first] {
+                #SendCmd "volume colormode $_colorMode ${fname} $dataset"
+                SendCmd "cutplane colormode $_colorMode ${fname} $dataset"
+            }
             SendCmd "camera reset"
             DrawLegend
@@ -1811 +1810 @@
     Rappture::Tooltip::for $itk_component(xCutButton) \
         "Toggle the X-axis cutplane on/off"
+    $itk_component(xCutButton) select
 
     itk_component add xCutScale {
@@ -1838 +1838 @@
     Rappture::Tooltip::for $itk_component(yCutButton) \
         "Toggle the Y-axis cutplane on/off"
+    $itk_component(yCutButton) select
 
     itk_component add yCutScale {
@@ -1865 +1866 @@
     Rappture::Tooltip::for $itk_component(zCutButton) \
         "Toggle the Z-axis cutplane on/off"
+    $itk_component(zCutButton) select
 
     itk_component add zCutScale {
@@ -1878 +1880 @@
     $itk_component(zCutScale) set 50
     $itk_component(zCutScale) configure -state disabled
-    #$itk_component(zCutScale) configure -state disabled
     Rappture::Tooltip::for $itk_component(zCutScale) \
         "@[itcl::code $this Slice tooltip z]"
@@ -2024 +2025 @@
     SendCmd "volume add $tag"
     SendCmd "cutplane add $tag"
-    SendCmd "cutplane edges 0 $tag"
-    SendCmd "cutplane wireframe 0 $tag"
-    SendCmd "cutplane lighting 1 $tag"
-    SendCmd "cutplane linewidth 1 $tag"
-    #SendCmd "cutplane linecolor 1 1 1 $tag"
-    #SendCmd "cutplane visible $tag"
-    foreach axis { x y z } {
-        SendCmd "cutplane slice $axis 0.5 $tag"
-        SendCmd "cutplane axis $axis 0 $tag"
-    }
+    SendCmd "cutplane visible 0 $tag"
 
     SendCmd "volume lighting $settings(-lighting) $tag"
@@ -2224 +2216 @@
         "move" {
             set axis [lindex $args 0]
-            set oldval $_settings(axis-${axis}position)
             set newval [lindex $args 1]
             if {[llength $args] != 2} {