Changeset 5283 for branches/1.4

Timestamp:

Apr 21, 2015, 2:56:27 PM (9 years ago)

Author:

ldelgass

Message:

merge r3899,r3901 from trunk

Location:

branches/1.4

Files:

• . (modified) (1 prop)
• gui/scripts/flowvisviewer.tcl (modified) (8 diffs)
• gui/scripts/nanovisviewer.tcl (modified) (1 diff)

branches/1.4/gui/scripts/flowvisviewer.tcl

@@ -244 +244 @@
         $this-opacity           50
         $this-thickness         350
-        $this-xcutplane         0
+        $this-cutplaneVisible   0
+        $this-xcutplane         1
         $this-xcutposition      0
-        $this-ycutplane         0
+        $this-ycutplane         1
         $this-ycutposition      0
-        $this-zcutplane         0
+        $this-zcutplane         1
         $this-zcutposition      0
     }]
@@ -309 +310 @@
         "Toggle the volume cloud on/off"
     pack $itk_component(volume) -padx 2 -pady 2
+
+    itk_component add cutplane {
+        Rappture::PushButton $f.cutplane \
+            -onimage [Rappture::icon cutbutton] \
+            -offimage [Rappture::icon cutbutton] \
+            -variable [itcl::scope _settings($this-cutplaneVisible)] \
+            -command [itcl::code $this AdjustSetting cutplaneVisible] 
+    }
+    Rappture::Tooltip::for $itk_component(cutplane) \
+        "Show/Hide cutplanes"
+    pack $itk_component(cutplane) -padx 2 -pady 2
 
     if { [catch {
@@ -1167 +1179 @@
     set _first [lindex [get] 0]
 
+    # Turn off cutplanes for all volumes
+    foreach axis {x y z} {
+        SendCmd "cutplane state 0 $axis"
+    }
+
     # Reset the camera and other view parameters
-    InitSettings light2side light opacity isosurface grid axes volume outline
-
+    InitSettings light2side light opacity isosurface grid axes volume outline \
+        cutplaneVisible xcutplane ycutplane zcutplane
+    
     # nothing to send -- activate the proper volume
     if {"" != $_first} {
@@ -1221 +1239 @@
     set vols [CurrentVolumeIds -cutplanes]
     foreach axis {x y z} {
-        SendCmd "cutplane state $_settings($this-${axis}cutplane) $axis $vols"
         set pos [expr {0.01*$_settings($this-${axis}cutposition)}]
         SendCmd "cutplane position $pos $axis $vols"
@@ -1521 +1538 @@
                 SendCmd "$tag configure -volume $_settings($this-volume)"
             }
+        }
+        "cutplaneVisible" {
+            set bool $_settings($this-$what)
+            set datasets [CurrentVolumeIds -cutplanes]
+            set tag [lindex $datasets 0]
+            SendCmd "cutplane visible $bool $tag"
         }
         "xcutplane" - "ycutplane" - "zcutplane" {
@@ -2088 +2111 @@
     Rappture::Tooltip::for $itk_component(xCutButton) \
         "Toggle the X cut plane on/off"
+    $itk_component(xCutButton) select
 
     itk_component add xCutScale {
@@ -2115 +2139 @@
     Rappture::Tooltip::for $itk_component(yCutButton) \
         "Toggle the Y cut plane on/off"
+    $itk_component(yCutButton) select
 
     itk_component add yCutScale {
@@ -2142 +2167 @@
     Rappture::Tooltip::for $itk_component(zCutButton) \
         "Toggle the Z cut plane on/off"
+    $itk_component(zCutButton) select
 
     itk_component add zCutScale {

branches/1.4/gui/scripts/nanovisviewer.tcl

@@ -967 +967 @@
 
         InitSettings -light2side -light -volumeopacity \
-            -isosurfaceshading -gridvisible -axesvisible
+            -isosurfaceshading -gridvisible -axesvisible \
+            -xcutplanevisible -ycutplanevisible -zcutplanevisible        
 
         if {"" != $_first} {