Changeset 4432 for branches/1.3/gui/scripts

Timestamp:

Jun 25, 2014 2:44:46 PM (10 years ago)

Author:

ldelgass

Message:

Fix heightmap viewer to match trunk and other viewers: _settings(-opacity) is
the widget [0,100] value, style and protocol is [0,1], conversions where
necessary. Remove _currentOpacity, as it is not needed.

File:

• branches/1.3/gui/scripts/vtkheightmapviewer.tcl (modified) (8 diffs)

branches/1.3/gui/scripts/vtkheightmapviewer.tcl

@@ -123 +123 @@
     private variable _currentColormap ""
     private variable _currentNumIsolines -1
-    private variable _currentOpacity 100.0; # Widget opacity setting 
-                                        #   between 0 and 100
-    
 
     private variable _maxScale 100;     # This is the # of times the x-axis
@@ -239 +236 @@
         -savelighting           1
         -numisolines            10
-        -opacity                1.0
+        -opacity                100
         -outline                0
         -wireframe              0
-        -saveopacity            1.0
+        -saveopacity            100
         -saveoutline            0
     }
     array set _changed {
-        -opacity                 0.0
+        -opacity                 0
         -colormap                0
         -numisolines             0
@@ -1511 +1508 @@
                 set _settings(-heightmapscale) 0
                 set _settings(-lighting) 0
-                set _settings(-opacity) 1.0
+                set _settings(-opacity) 100
                 set _settings(-outline)  $_settings(-saveoutline)
             }
@@ -1626 +1623 @@
         "-opacity" {
             set _changed($what) 1
-            set _settings($what)  [expr double($_currentOpacity) * 0.01]
+            set val [expr $_settings($what) * 0.01]
             if { $_settings(-isheightmap) } {
                 set _settings(-saveopacity) $_settings($what)
-                SendCmd "heightmap opacity $_settings($what)"
+                SendCmd "heightmap opacity $val"
             } else {
                 SendCmd "heightmap opacity 1.0"
@@ -1985 +1982 @@
     itk_component add opacity {
         ::scale $inner.opacity -from 0 -to 100 -orient horizontal \
-            -variable [itcl::scope _currentOpacity] \
+            -variable [itcl::scope _settings(-opacity)] \
             -showvalue off \
             -command [itcl::code $this AdjustSetting -opacity]
@@ -2298 +2295 @@
 
     if { $_changed(-opacity) } {
-        set style(-opacity) $_settings(-opacity)
+        set style(-opacity) [expr $_settings(-opacity) * 0.01]
     }
     if { $_changed(-numisolines) } {
@@ -2313 +2310 @@
         AdjustSetting -stretchtofit
     }
-    set _currentOpacity [expr $style(-opacity) * 100.0]
 
     if { $_currentNumIsolines != $style(-levels) } {
@@ -2336 +2332 @@
     SendCmd "heightmap isolines $_settings(-isolinesvisible) $tag"
     SendCmd "heightmap surface $_settings(-colormapvisible) $tag"
+    SendCmd "heightmap opacity $style(-opacity) $tag"
+    set _settings(-opacity) [expr $style(-opacity) * 100.0]
 }