Changeset 4487 for branches/1.3/gui

Timestamp:

Jul 11, 2014 10:41:04 PM (10 years ago)

Author:

ldelgass

Message:

merge r4381 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• gui/scripts/vtksurfaceviewer.tcl (modified) (5 diffs)

branches/1.3/gui/scripts/vtksurfaceviewer.tcl

@@ -117 +117 @@
     private variable _currentColormap ""
     private variable _currentNumContours -1
-    private variable _currentOpacity ""
 
     private variable _dataset2style    ;# maps dataobj-component to transfunc
@@ -398 +397 @@
     EnableWaitDialog 500
     Connect
-    update
 }
 
@@ -1906 +1904 @@
 
     if { $_changed(-surfaceopacity) } {
-        set style(-opacity) $_settings(-surfaceopacity)
+        set style(-opacity) [expr $_settings(-surfaceopacity) * 0.01]
     }
     if { $_changed(-numcontours) } {
@@ -1918 +1916 @@
         $itk_component(colormap) value $style(-color)
     }
-    set _currentOpacity $style(-opacity)
     if { $_currentNumContours != $style(-levels) } {
         set _currentNumContours $style(-levels)
@@ -1944 +1941 @@
     SendCmd "polydata linecolor [Color2RGB $style(-edgecolor)] $tag"
     SendCmd "polydata linewidth $style(-linewidth) $tag"
-    SendCmd "polydata opacity $_currentOpacity $tag"
-    set _settings(-surfaceopacity) $style(-opacity)
+    SendCmd "polydata opacity $style(-opacity) $tag"
+    set _settings(-surfaceopacity) [expr $style(-opacity) * 100.0]
     SetCurrentColormap $style(-color) 
     SendCmd "polydata wireframe $style(-wireframe) $tag"
     set _settings(-surfacewireframe) $style(-wireframe)
-    set _settings(-surfaceopacity) [expr $style(-opacity) * 100.0]
 }