Changeset 4558 for branches/1.3/gui/scripts

Timestamp:

Jul 17, 2014, 10:22:29 PM (10 years ago)

Author:

ldelgass

Message:

Fix lighting settings for components

File:

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

branches/1.3/gui/scripts/nanovisviewer.tcl

@@ -221 +221 @@
 
     array set _settings {
-        -axesvisible       1
-        -background        black
-        -colormap          default
-        -cutplanesvisible  0
-        -gridvisible       0
-        -isosurfaceshading 0
-        -legendvisible     1
-        -light2side        1
-        -outlinevisible    0
-        -qw                0.853553
-        -qx                -0.353553
-        -qy                0.353553
-        -qz                0.146447
-        -thickness         350
-        -volume            1
-        -volumeopacity     0.5
-        -volumevisible     1
-        -xcutplaneposition 50
-        -xcutplanevisible  1
-        -xpan              0
-        -ycutplaneposition 50
-        -ycutplanevisible  1
-        -ypan              0
-        -zcutplaneposition 50
-        -zcutplanevisible  1
-        -zoom              1.0
+        -axesvisible            1
+        -background             black
+        -colormap               default
+        -cutplanesvisible       0
+        -gridvisible            0
+        -isosurfaceshading      0
+        -legendvisible          1
+        -light2side             1
+        -outlinevisible         0
+        -qw                     0.853553
+        -qx                     -0.353553
+        -qy                     0.353553
+        -qz                     0.146447
+        -thickness              350
+        -volume                 1
+        -volumeopacity          0.5
+        -volumevisible          1
+        -xcutplaneposition      50
+        -xcutplanevisible       1
+        -xpan                   0
+        -ycutplaneposition      50
+        -ycutplanevisible       1
+        -ypan                   0
+        -zcutplaneposition      50
+        -zcutplanevisible       1
+        -zoom                   1.0
     }
     array set _widget {
@@ -1210 +1210 @@
             SendCmd "axis visible $_settings($what)"
         }
+        "-background" {
+            set bgcolor [$itk_component(background) value]
+            array set fgcolors {
+                "black" "white"
+                "white" "black"
+                "grey"  "black"
+            }
+            configure -plotbackground $bgcolor \
+                -plotforeground $fgcolors($bgcolor)
+            DrawLegend $_current
+        }
         "-colormap" {
             set color [$itk_component(colormap) value]
@@ -1237 +1248 @@
             }
         }
-        "-background" {
-            set bgcolor [$itk_component(background) value]
-            array set fgcolors {
-                "black" "white"
-                "white" "black"
-                "grey"  "black"
-            }
-            configure -plotbackground $bgcolor \
-                -plotforeground $fgcolors($bgcolor)
-            DrawLegend $_current
-        }
         "-gridvisible" {
             SendCmd "grid visible $_settings($what)"
@@ -1265 +1265 @@
         }
         "-light" {
+            set _settings($_current${what}) $_settings($what)
             set val $_settings($what)
             set diffuse [expr {0.01*$val}]
@@ -1270 +1271 @@
             set specularLevel 0.3
             set specularExp 90.0
-            SendCmd "volume shading ambient $ambient"
-            SendCmd "volume shading diffuse $diffuse"
-            SendCmd "volume shading specularLevel $specularLevel"
-            SendCmd "volume shading specularExp $specularExp"
+            foreach tag [GetDatasetsWithComponent $_current] {
+                SendCmd "volume shading ambient $ambient $tag"
+                SendCmd "volume shading diffuse $diffuse $tag"
+                SendCmd "volume shading specularLevel $specularLevel $tag"
+                SendCmd "volume shading specularExp $specularExp $tag"
+            }
         }
         "-light2side" {
+            set _settings($_current${what}) $_settings($what)
             set val $_settings($what)
-            SendCmd "volume shading light2side $val"
+            foreach tag [GetDatasetsWithComponent $_current] {
+                SendCmd "volume shading light2side $val"
+            }
         }
         "-volumeopacity" {
@@ -1648 +1654 @@
 
     $itk_component(background) value $_settings(-background)
-    bind $inner.background <<Value>> [itcl::code $this AdjustSetting -background]
+    bind $inner.background <<Value>> \
+        [itcl::code $this AdjustSetting -background]
 
     blt::table $inner \
@@ -1714 +1721 @@
     }
 
-    $inner.colormap choices insert end [GetColormapList -includeNone]
-    $itk_component(colormap) value "BCGYR"
+    $inner.colormap choices insert end [GetColormapList -includeDefault -includeNone]
     bind $inner.colormap <<Value>> \
         [itcl::code $this AdjustSetting -colormap]