Changeset 3988

Timestamp:

Oct 3, 2013 3:42:37 PM (9 years ago)

Author:

gah

Message:

fix typo in AdjustSettings? for vtkvolumeviewer

Location:

trunk

Files:

• builder/scripts/main.tcl (modified) (1 diff)
• gui/scripts/vtkvolumeviewer.tcl (modified) (8 diffs)

trunk/builder/scripts/main.tcl

@@ -869 +869 @@
                 # /apps/rappture/current for 32-bit systems
                 # /apps/share64/rappture/current for 64-bit systems
+                puts stderr "TOOLDIR=[file dir [info nameofexecutable]]"
                 if {$tcl_platform(wordSize) == 8
                       && [file isdirectory /apps/share64/rappture/current]} {

trunk/gui/scripts/vtkvolumeviewer.tcl

@@ -1366 +1366 @@
         "volumeVisible" {
             set bool $_settings(volumeVisible)
-            set _settings($cname-volumeVisible)
+            set _settings($_current-volumeVisible)
             foreach tag [GetDatasetsWithComponent $_current] {
                 SendCmd "volume visible $bool $tag"
@@ -1382 +1382 @@
             set mode [$itk_component(blendmode) translate $val]
             set _settings(volumeBlendMode) $mode
-            set _settings($cname-volumeBlendMode) $mode
+            set _settings($_current-volumeBlendMode) $mode
             foreach tag [GetDatasetsWithComponent $_current] {
                 SendCmd "volume blendmode $mode $tag"
@@ -1389 +1389 @@
         "volumeAmbient" {
             set val $_settings(volumeAmbient)
-            set _settings($cname-volumnAmbient) $val
+            set _settings($_current-volumnAmbient) $val
             set ambient [expr {0.01*$val}]
             foreach tag [GetDatasetsWithComponent $_current] {
@@ -1397 +1397 @@
         "volumeDiffuse" {
             set val $_settings(volumeDiffuse)
-            set _settings($cname-volumeDiffuse) $val
+            set _settings($_current-volumeDiffuse) $val
             set diffuse [expr {0.01*$val}]
             foreach tag [GetDatasetsWithComponent $_current] {
@@ -1405 +1405 @@
         "volumeSpecularLevel" - "volumeSpecularExponent" {
             set val $_settings(volumeSpecularLevel)
-            set _settings($cname-volumnSpecularLevel) $val
+            set _settings($_current-volumnSpecularLevel) $val
             set level [expr {0.01*$val}]
             set exp $_settings(volumeSpecularExponent)
@@ -1414 +1414 @@
         "volumeLighting" {
             set bool $_settings(volumeLighting)
-            set _settings($cname-volumeLighting) $bool
+            set _settings($_current-volumeLighting) $bool
             foreach tag [GetDatasetsWithComponent $_current] {
                 SendCmd "volume lighting $bool $tag"
@@ -1421 +1421 @@
         "volumeOpacity" {
             set val $_settings(volumeOpacity)
-            set _settings($cname-volumeOpacity) $val
+            set _settings($_current-volumeOpacity) $val
             set val [expr {0.01*$val}]
             foreach tag [GetDatasetsWithComponent $_current] {
@@ -1429 +1429 @@
         "volumeQuality" {
             set val $_settings(volumeQuality)
-            set _settings($cname-volumeQuality) $val
+            set _settings($_current-volumeQuality) $val
             set val [expr {0.01*$val}]
             foreach tag [GetDatasetsWithComponent $_current] {