Changeset 6045

Timestamp:

Feb 23, 2016 1:20:37 PM (8 years ago)

Author:

ldelgass

Message:

Don't change default style settings for "background" dataobjs in 3D viewers.
Also, fix opacity style setting for isosurface viewer.

Location:

trunk/gui/scripts

Files:

• vtkglyphviewer.tcl (modified) (1 diff)
• vtkisosurfaceviewer.tcl (modified) (4 diffs)
• vtkmeshviewer.tcl (modified) (1 diff)
• vtkstreamlinesviewer.tcl (modified) (1 diff)
• vtksurfaceviewer.tcl (modified) (1 diff)
• vtkviewer.tcl (modified) (1 diff)

trunk/gui/scripts/vtkglyphviewer.tcl

@@ -2191 +2191 @@
         array unset style -scaleMode
     }
-    if { $dataobj != $_first } {
-        set style(-opacity) 1
-    }
     if 0 {
     SendCmd "cutplane add $tag"

trunk/gui/scripts/vtkisosurfaceviewer.tcl

@@ -2269 +2269 @@
 
 itcl::body Rappture::VtkIsosurfaceViewer::SetObjectStyle { dataobj comp } {
+    DebugTrace "Enter"
     # Parse style string.
     set tag $dataobj-$comp
@@ -2295 +2296 @@
         -zcutplanevisible       1
     }
+    if { $style(-levels) == 1 } {
+        set style(-opacity) 1.0
+    }
     array set style [$dataobj style $comp]
-    if { $dataobj != $_first || $style(-levels) == 1 } {
-        set style(-opacity) 1.0
-    }
+    #DebugTrace [array get style]
 
     # This is too complicated.  We want to set the colormap, number of
@@ -2366 +2368 @@
     SendCmd "cutplane lighting $style(-cutplanelighting) $tag"
     SendCmd "cutplane opacity $style(-cutplaneopacity) $tag"
+    set _widget(-cutplaneopacity) [expr $style(-cutplaneopacity) * 100]
     SendCmd "cutplane preinterp $style(-cutplanepreinterp) $tag"
     SendCmd "cutplane wireframe $style(-cutplanewireframe) $tag"
@@ -2386 +2389 @@
     SendCmd "contour3d opacity $style(-opacity) $tag"
     set _settings(-isosurfaceopacity) $style(-opacity)
+    set _widget(-isosurfaceopacity) [expr $style(-opacity) * 100]
     SetCurrentColormap $style(-color)
     SendCmd "contour3d wireframe $style(-wireframe) $tag"

trunk/gui/scripts/vtkmeshviewer.tcl

@@ -1525 +1525 @@
         -wireframe 0
     }
-    if { $dataobj != $_first } {
-        set style(-wireframe) 1
-    }
     if {$type == "cloud"} {
         set style(-cloudstyle) points

trunk/gui/scripts/vtkstreamlinesviewer.tcl

@@ -2117 +2117 @@
     }
     array set style [$dataobj style $comp]
-    if { $dataobj != $_first } {
-        set style(-opacity) 1.0
-    }
+
     StartBufferingCommands
     SendCmd "streamlines add $tag"

trunk/gui/scripts/vtksurfaceviewer.tcl

@@ -1894 +1894 @@
     }
     array set style [$dataobj style $comp]
-    if { $dataobj != $_first || $style(-levels) == 1 } {
-        set style(-opacity) 1.0
-    }
 
     # This is too complicated.  We want to set the colormap, number of

trunk/gui/scripts/vtkviewer.tcl

@@ -2634 +2634 @@
     set type [$dataobj type $comp]
     set style [$dataobj style $comp]
-    if { $dataobj != $_first } {
-        set settings(-wireframe) 1
-    }
     switch -- $type {
         "glyphs" {