Changeset 4563 for branches/1.3/gui/scripts/nanovisviewer.tcl

Timestamp:

Jul 17, 2014, 10:59:23 PM (10 years ago)

Author:

ldelgass

Message:

Fix component-specific opacity setting. _widget was preventing the widget from
actually being updated. Just minimize diff with trunk for now. Refactoring
can be done on the trunk later.

File:

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

branches/1.3/gui/scripts/nanovisviewer.tcl

@@ -150 +150 @@
     private variable _settings
     private variable _alphamap
-    private variable _widget
 
     private variable _first "" ;        # This is the topmost volume.
@@ -230 +229 @@
         -light                  40
         -light2side             1
+        -opacity                50
         -outlinevisible         0
         -qw                     0.853553
@@ -237 +237 @@
         -thickness              350
         -volume                 1
-        -volumeopacity          0.5
         -volumevisible          1
         -xcutplaneposition      50
@@ -248 +247 @@
         -zcutplanevisible       1
         -zoom                   1.0
-    }
-    array set _widget {
-        -volumeopacity     50
     }
     itk_component add 3dview {
@@ -960 +956 @@
         }
 
-        InitSettings -light2side -light -volumeopacity \
+        InitSettings -light2side -light -opacity \
             -isosurfaceshading -gridvisible -axesvisible \
             -current
@@ -1291 +1287 @@
             }
         }
-        "-volumeopacity" {
-            set _settings($what) [expr $_widget($what) * 0.01]
+        "-opacity" {
             set _settings($_current${what}) $_settings($what)
             foreach tag [GetDatasetsWithComponent $_current] {
@@ -1708 +1703 @@
     label $inner.fog -text "Clear" -font $fg
     ::scale $inner.transp -from 0 -to 100 -orient horizontal \
-        -variable [itcl::scope _widget(-volumeopacity)] \
+        -variable [itcl::scope _settings(-opacity)] \
         -width 10 \
-        -showvalue off -command [itcl::code $this AdjustSetting -volumeopacity]
+        -showvalue off -command [itcl::code $this AdjustSetting -opacity]
     label $inner.plastic -text "Opaque" -font $fg
 
@@ -2106 +2101 @@
         $cname-light             40
         $cname-light2side        1
-        $cname-volumeopacity     0.5
+        $cname-opacity           50
         $cname-thickness         350
         $cname-volumevisible     1
@@ -2127 +2122 @@
     set _settings(-light)            $_settings($cname-light)
     set _settings(-light2side)       $_settings($cname-light2side)
+    set _settings(-opacity)          $_settings($cname-opacity)
     set _settings(-thickness)        $_settings($cname-thickness)
-    set _settings(-volumeopacity)    $_settings($cname-volumeopacity)
     set _settings(-volumevisible)    $_settings($cname-volumevisible)
     $itk_component(colormap) value   $_settings($cname-colormap)