Changeset 4431

Timestamp:

Jun 25, 2014 2:28:42 PM (10 years ago)

Author:

ldelgass

Message:

Merge trunk fixes

Location:

branches/1.3/gui/scripts

Files:

• vtkglyphviewer.tcl (modified) (4 diffs)
• vtkisosurfaceviewer.tcl (modified) (7 diffs)

branches/1.3/gui/scripts/vtkglyphviewer.tcl

@@ -119 +119 @@
     # heightmaps displayed.
     private variable _currentColormap ""
-    private variable _currentOpacity ""
 
     private variable _dataset2style    ;# maps dataobj-component to transfunc
@@ -2094 +2093 @@
 
     if { $_changed(glyphOpacity) } {
-        set style(-opacity) $_settings(glyphOpacity)
+        set style(-opacity) [expr $_settings(glyphOpacity) * 0.01]
     }
     if { $_changed(colormap) } {
@@ -2102 +2101 @@
         $itk_component(colormap) value $style(-color)
     }
-    set _currentOpacity $style(-opacity)
     SendCmd "glyphs add $style(-shape) $tag"
     SendCmd "glyphs edges $style(-edges) $tag"
@@ -2129 +2127 @@
     SendCmd "glyphs linewidth $style(-linewidth) $tag"
     SendCmd "glyphs ptsize $style(-ptsize) $tag"
-    SendCmd "glyphs opacity $_currentOpacity $tag"
-    set _settings(glyphOpacity) $style(-opacity)
+    SendCmd "glyphs opacity $style(-opacity) $tag"
+    set _settings(glyphOpacity) [expr $style(-opacity) * 100.0]
     SetCurrentColormap $style(-color) 
     SendCmd "glyphs wireframe $style(-wireframe) $tag"
     set _settings(glyphWireframe) $style(-wireframe)
-    set _settings(glyphOpacity) [expr $style(-opacity) * 100.0]
 }
 

branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl

@@ -122 +122 @@
     private variable _currentColormap ""
     private variable _currentNumContours -1
-    private variable _currentOpacity ""
 
     private variable _dataset2style    ;# maps dataobj-component to transfunc
@@ -354 +353 @@
     $itk_component(contour) select
     Rappture::Tooltip::for $itk_component(contour) \
-        "Don't display the isosurface"
+        "Hide the isosurface"
     pack $itk_component(contour) -padx 2 -pady 2
 
@@ -365 +364 @@
     }
     Rappture::Tooltip::for $itk_component(cutplane) \
-        "Show/Hide cutplanes"
+        "Show the cutplanes"
     pack $itk_component(cutplane) -padx 2 -pady 2
 
@@ -1720 +1719 @@
         -showvalue off \
         -command [itcl::code $this AdjustSetting -isosurfaceopacity]
-
-    label $inner.scale_l -text "Scale" -font "Arial 9"
-    ::scale $inner.scale -from 1 -to 100 -orient horizontal \
-        -variable [itcl::scope _settings(-contourscale)] \
-        -width 10 \
-        -showvalue off \
-        -command [itcl::code $this AdjustSetting -contourscale]
 
     itk_component add field_l {
@@ -2210 +2202 @@
 
     if { $_changed(-isosurfaceopacity) } {
-        set style(-opacity) $_settings(-isosurfaceopacity)
+        set style(-opacity) [expr $_settings(-isosurfaceopacity) * 0.01]
     }
     if { $_changed(-numcontours) } {
@@ -2222 +2214 @@
         $itk_component(colormap) value $style(-color)
     }
-    set _currentOpacity $style(-opacity)
     if { $_contourList(numLevels) != $style(-levels) } {
         set _settings(-numcontours) $style(-levels)
@@ -2252 +2243 @@
     SendCmd "contour3d linecolor [Color2RGB $style(-edgecolor)] $tag"
     SendCmd "contour3d linewidth $style(-linewidth) $tag"
-    SendCmd "contour3d opacity $_currentOpacity $tag"
-    set _settings(-isosurfaceopacity) $style(-opacity)
+    SendCmd "contour3d opacity $style(-opacity) $tag"
+    set _settings(-isosurfaceopacity) [expr $style(-opacity) * 100.0]
     SetCurrentColormap $style(-color) 
     SendCmd "contour3d wireframe $style(-wireframe) $tag"
     set _settings(-isosurfacewireframe) $style(-wireframe)
-    set _settings(-isosurfaceopacity) [expr $style(-opacity) * 100.0]
 }