Changeset 5454 for branches/1.3/gui

Timestamp:

May 7, 2015 3:14:43 AM (9 years ago)

Author:

ldelgass

Message:

Some flowvis fixes from merge and sync with 1.4 branch

File:

• branches/1.3/gui/scripts/flowvisviewer.tcl (modified) (9 diffs)

branches/1.3/gui/scripts/flowvisviewer.tcl

@@ -1124 +1124 @@
         foreach comp [$dataobj components] {
             set tag $dataobj-$comp
-            # Send the data as one huge base64-encoded mess -- yuck!
-            set data [$dataobj blob $comp]
+            set isvtk 0
+            # FIXME: Would like to use the type method of the dataobj
+            # but the returned value isn't well defined now
+            if {[catch {
+                # Send the data as one huge base64-encoded mess -- yuck!
+                set data [$dataobj blob $comp]
+            }]} {
+                set data [$dataobj vtkdata $comp]
+                set isvtk 1
+            }
             set nbytes [string length $data]
             if { $_reportClientInfo }  {
@@ -1141 +1149 @@
             set extents [$dataobj extents $comp]
             # I have a field. Is a vector field or a volume field?
-            if { $extents == 1 } {
+            if { !$isvtk && $extents == 1 } {
                 SendCmd "volume data follows $nbytes $tag"
             } else {
@@ -1155 +1163 @@
 
     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
@@ -1440 +1453 @@
                 set comp [lindex [$_first components] 0]
                 set tag $_first-$comp
-                set diffuse [expr {0.01*$_settings($this-light)}]
+                set diffuse [expr {0.01*$_settings($what)}]
                 set ambient [expr {1.0 - $diffuse}]
                 set specularLevel 0.3
@@ -1582 +1595 @@
         -color BCGYR
         -levels 6
+        -opacity 0.5
     }
     array set style [lindex [$dataobj components -style $cname] 0]
     set tf "$style(-color):$style(-levels)"
+    set _settings(-opacity) [expr $style(-opacity) * 100]
     set _dataset2style($dataobj-$cname) $tf
     lappend _style2datasets($tf) $dataobj $cname
@@ -1997 +2012 @@
         -variable [itcl::scope _settings(-light)] \
         -width 10 \
-        -showvalue off -command [itcl::code $this AdjustSetting light]
+        -showvalue off -command [itcl::code $this AdjustSetting -light]
     label $inner.bright -text "Surface" -font $fg
 
@@ -2058 +2073 @@
     Rappture::Tooltip::for $itk_component(xCutButton) \
         "Toggle the X cut plane on/off"
+    $itk_component(xCutButton) select
 
     itk_component add xCutScale {
@@ -2085 +2101 @@
     Rappture::Tooltip::for $itk_component(yCutButton) \
         "Toggle the Y cut plane on/off"
+    $itk_component(yCutButton) select
 
     itk_component add yCutScale {
@@ -2112 +2129 @@
     Rappture::Tooltip::for $itk_component(zCutButton) \
         "Toggle the Z cut plane on/off"
+    $itk_component(zCutButton) select
 
     itk_component add zCutScale {