Changeset 3899 for trunk

Timestamp:

Aug 27, 2013, 12:38:22 PM (11 years ago)

Author:

ldelgass

Message:

Add cutplane visibility button to nanovis viewers.

Location:

trunk/gui/scripts

Files:

• flowvisviewer.tcl (modified) (8 diffs)
• nanovisviewer.tcl (modified) (7 diffs)
• vtkglyphviewer.tcl (modified) (2 diffs)
• vtkheightmapviewer.tcl (modified) (2 diffs)
• vtkisosurfaceviewer.tcl (modified) (2 diffs)
• vtkstreamlinesviewer.tcl (modified) (2 diffs)
• vtkviewer.tcl (modified) (3 diffs)
• vtkvolumeviewer.tcl (modified) (1 diff)

trunk/gui/scripts/flowvisviewer.tcl

@@ -253 +253 @@
         $this-streams           0
         $this-volume            1
-        $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
     }]
@@ -318 +319 @@
         "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 {
@@ -1238 +1250 @@
     set _first [lindex [get] 0]
 
+    foreach axis {x y z} {
+        # Turn off cutplanes for all volumes
+        SendCmd "cutplane state 0 $axis"
+    }
+
     # Reset the camera and other view parameters
-    InitSettings light2side light transp isosurface grid axes volume outline
+    InitSettings light2side light transp isosurface grid axes volume outline \
+        cutplaneVisible xcutplane ycutplane zcutplane
     
     # nothing to send -- activate the proper volume
@@ -1295 +1313 @@
     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"
@@ -1707 +1724 @@
             }
         }
+        "cutplaneVisible" {
+            set bool $_settings($this-$what)
+            set datasets [CurrentVolumeIds -cutplanes]
+            set tag [lindex $datasets 0]
+            SendCmd "cutplane visible $bool $tag"
+        }
         "xcutplane" - "ycutplane" - "zcutplane" {
             set axis [string range $what 0 0]
@@ -2304 +2327 @@
     Rappture::Tooltip::for $itk_component(xCutButton) \
         "Toggle the X cut plane on/off"
+    $itk_component(xCutButton) select
 
     itk_component add xCutScale {
@@ -2331 +2355 @@
     Rappture::Tooltip::for $itk_component(yCutButton) \
         "Toggle the Y cut plane on/off"
+    $itk_component(yCutButton) select
 
     itk_component add yCutScale {
@@ -2358 +2383 @@
     Rappture::Tooltip::for $itk_component(zCutButton) \
         "Toggle the Z cut plane on/off"
+    $itk_component(zCutButton) select
 
     itk_component add zCutScale {

trunk/gui/scripts/nanovisviewer.tcl

@@ -220 +220 @@
         $this-ypan              $_view(ypan)
         $this-volume            1
-        $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
     }]
@@ -285 +286 @@
         "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 {
@@ -944 +956 @@
         PanCamera
         SendCmd "camera zoom $_view(zoom)"
-        InitSettings light2side light transp isosurface grid axes 
-        
+
         foreach axis {x y z} {
             # Turn off cutplanes for all volumes
             SendCmd "cutplane state 0 $axis"
         }
+
+        InitSettings light2side light transp isosurface grid axes \
+            cutplaneVisible xcutplane ycutplane zcutplane
+
         if {"" != $_first} {
             set axis [$_first hints updir]
@@ -1268 +1283 @@
             set datasets [CurrentDatasets -cutplanes] 
             SendCmd "volume data state $_settings($this-volume) $datasets"
+        }
+        "cutplaneVisible" {
+            set bool $_settings($this-$what)
+            set datasets [CurrentDatasets -cutplanes]
+            set tag [lindex $datasets 0]
+            SendCmd "cutplane visible $bool $tag"
         }
         "xcutplane" - "ycutplane" - "zcutplane" {
@@ -1826 +1847 @@
     Rappture::Tooltip::for $itk_component(xCutButton) \
         "Toggle the X cut plane on/off"
+    $itk_component(xCutButton) select
 
     itk_component add xCutScale {
@@ -1853 +1875 @@
     Rappture::Tooltip::for $itk_component(yCutButton) \
         "Toggle the Y cut plane on/off"
+    $itk_component(yCutButton) select
 
     itk_component add yCutScale {
@@ -1880 +1903 @@
     Rappture::Tooltip::for $itk_component(zCutButton) \
         "Toggle the Z cut plane on/off"
+    $itk_component(zCutButton) select
 
     itk_component add zCutScale {

trunk/gui/scripts/vtkglyphviewer.tcl

@@ -1486 +1486 @@
     set font "Arial 8"
     set lineht [font metrics $font -linespace]
-    set c $itk_component(view)
     set w 12
     set h [expr {$_height - 2 * ($lineht + 2)}]
-    if { $h < 1} {
+    if { $h < 1 } {
         return
     }
@@ -2226 +2225 @@
         "move" {
             set axis [lindex $args 0]
-            set a [string toupper $axis]
-            set oldval $_settings(cutplane${a}Position)
             set newval [lindex $args 1]
             if {[llength $args] != 2} {

trunk/gui/scripts/vtkheightmapviewer.tcl

@@ -1660 +1660 @@
         incr h -$lineht 
     }
-    if { $h < 1} {
+    if { $h < 1 } {
         return
     }
@@ -2422 +2422 @@
     incr y $lineht
     $c coords colormap $x $y
-    set ix [image width $_image(legend)]
-    set ih [image height $_image(legend)]
     $c coords sensor [expr $x - $iw] $y $x [expr $y + $ih]
     $c raise sensor

trunk/gui/scripts/vtkisosurfaceviewer.tcl

@@ -1507 +1507 @@
     set font "Arial 8"
     set lineht [font metrics $font -linespace]
-    set c $itk_component(view)
     set w 12
     set h [expr {$_height - 2 * ($lineht + 2)}]
-    if { $h < 1} {
+    if { $h < 1 } {
         return
     }
@@ -2289 +2288 @@
         "move" {
             set axis [lindex $args 0]
-            set a [string toupper $axis]
-            set oldval $_settings(cutplane${a}Position)
             set newval [lindex $args 1]
             if {[llength $args] != 2} {

trunk/gui/scripts/vtkstreamlinesviewer.tcl

@@ -1505 +1505 @@
     set font "Arial 8"
     set lineht [font metrics $font -linespace]
-    set c $itk_component(legend)
     set w 12
     set h [expr {$_height - 3 * ($lineht + 2)}]
-    if { $h < 1} {
+    if { $h < 1 } {
         return
     }
@@ -2361 +2360 @@
         "move" {
             set axis [lindex $args 0]
-            set oldval $_settings(axis-${axis}position)
             set newval [lindex $args 1]
             if {[llength $args] != 2} {

trunk/gui/scripts/vtkviewer.tcl

@@ -1613 +1613 @@
     set font "Arial 8"
     set lineht [font metrics $font -linespace]
-    set c $itk_component(legend)
     set w 12
     set h [expr {$_height - 2 * ($lineht + 2)}]
-    if { $h < 1} {
+    if { $h < 1 } {
         return
     }
@@ -2132 +2131 @@
     $itk_component(zCutScale) set 100
     $itk_component(zCutScale) configure -state disabled
-    #$itk_component(zCutScale) configure -state disabled
     Rappture::Tooltip::for $itk_component(zCutScale) \
         "@[itcl::code $this Slice tooltip z]"
@@ -2660 +2658 @@
         "move" {
             set axis [lindex $args 0]
-            set oldval $_axis(${axis}position)
             set newval [lindex $args 1]
             if {[llength $args] != 2} {

trunk/gui/scripts/vtkvolumeviewer.tcl

@@ -1451 +1451 @@
     set font "Arial 8"
     set lineht [font metrics $font -linespace]
-    set c $itk_component(legend)
     set w 12
     set h [expr {$_height - 3 * ($lineht + 2)}]
-    if { $h < 1} {
+    if { $h < 1 } {
         return
     }