Changeset 5299 for branches/1.4

Timestamp:

Apr 23, 2015, 3:46:41 PM (10 years ago)

Author:

ldelgass

Message:

Roll back widget/settings partial refactor in nanovis viewer. We can do a more
complete refactor in the trunk.

File:

• branches/1.4/gui/scripts/nanovisviewer.tcl (modified) (12 diffs)

branches/1.4/gui/scripts/nanovisviewer.tcl

@@ -143 +143 @@
     private variable _transferFunctionEditors
     private variable _settings
-    private variable _widget
 
     private variable _first ""         ;# This is the topmost volume.
@@ -222 +221 @@
         -light                  40
         -light2side             1
+        -opacity                50
         -outlinevisible         0
         -qw                     0.853553
@@ -229 +229 @@
         -thickness              350
         -volume                 1
-        -volumeopacity          0.5
         -volumevisible          1
         -xcutplaneposition      50
@@ -240 +239 @@
         -zcutplanevisible       1
         -zoom                   1.0
-    }
-    array set _widget {
-        -volumeopacity          50
     }
     itk_component add 3dview {
@@ -962 +958 @@
         }
 
-        InitSettings -light2side -light -volumeopacity \
+        InitSettings -light2side -light -opacity \
             -isosurfaceshading -gridvisible -axesvisible \
             -xcutplanevisible -ycutplanevisible -zcutplanevisible        
@@ -1279 +1275 @@
             }
         }
+        "-opacity" {
+            set _settings($_current${what}) $_settings($what)
+            set val $_settings($what)
+            set sval [expr { 0.01 * double($val) }]
+            foreach tag [GetDatasetsWithComponent $_current] {
+                SendCmd "volume shading opacity $sval $tag"
+            }
+        }
         "-outlinevisible" {
             SendCmd "volume outline state $_settings($what)"
@@ -1299 +1303 @@
             }
             set _settings(-volumevisible) $bool
-        }
-        "-volumeopacity" {
-            set _settings($what) [expr $_widget($what) * 0.01]
-            set _settings($_current${what}) $_settings($what)
-            foreach tag [GetDatasetsWithComponent $_current] {
-                SendCmd "volume shading opacity $_settings($what) $tag"
-            }
         }
         "-volumevisible" {
@@ -1661 +1658 @@
     label $inner.opacity_l -text "Opacity" -font $fg
     ::scale $inner.opacity -from 0 -to 100 -orient horizontal \
-        -variable [itcl::scope _widget(-volumeopacity)] \
-        -showvalue off \
-        -command [itcl::code $this AdjustSetting -volumeopacity] \
+        -variable [itcl::scope _settings(-opacity)] \
+        -showvalue off -command [itcl::code $this AdjustSetting -opacity] \
         -troughcolor grey92
 
@@ -2006 +2002 @@
         -light             40
         -light2side        1
+        -opacity           50
         -thickness         350
-        -volumeopacity     1.0
         -volumevisible     1
     } {
@@ -2035 +2031 @@
     set _settings(-light)            $_settings($cname-light)
     set _settings(-light2side)       $_settings($cname-light2side)
-    set _settings(-volumeopacity)    $_settings($cname-volumeopacity)
+    set _settings(-opacity)          $_settings($cname-opacity)
     set _settings(-thickness)        $_settings($cname-thickness)
     set _settings(-volumevisible)    $_settings($cname-volumevisible)
     $itk_component(colormap) value   $_settings($cname-colormap)
-
-    set _widget(-volumeopacity) [expr $_settings(-volumeopacity) * 100.0]
-
     set _current $cname;                # Reset the current component
 }
@@ -2195 +2188 @@
 itcl::body Rappture::NanovisViewer::SetObjectStyle { dataobj cname } {
     array set style {
-        -opacity  0.5
+        -opacity 0.5
     }
     array set style [lindex [$dataobj components -style $cname] 0]
@@ -2201 +2194 @@
     # override the requested opacity for now
     set style(-opacity) 0.5
-    set _settings($cname-volumeopacity) $style(-opacity)
+    set _settings($cname-opacity) [expr $style(-opacity) * 100.0]
     set tag $dataobj-$cname
-    SendCmd "volume shading opacity $_settings($cname-volumeopacity) $tag"
+    SendCmd "volume shading opacity $style(-opacity) $tag"
     NameTransferFunction $dataobj $cname
 }