Changeset 5387

Timestamp:

May 1, 2015, 5:07:08 PM (9 years ago)

Author:

ldelgass

Message:

Reorder some settings initialization

File:

• trunk/gui/scripts/nanovisviewer.tcl (modified) (5 diffs)

trunk/gui/scripts/nanovisviewer.tcl

@@ -932 +932 @@
     }
     set _first [lindex [get] 0]
+    # Outline seems to need to be reset every update.
+    InitSettings -outlinevisible -cutplanesvisible
     if { $_reset } {
         #
@@ -956 +958 @@
         }
 
-        InitSettings -light2side -ambient -diffuse -specularlevel \
-            -specularexponent -opacity -isosurfaceshading -gridvisible \
-            -axesvisible -xcutplanevisible -ycutplanevisible -zcutplanevisible \
+        InitSettings -axesvisible -gridvisible \
+            -light2side -isosurfaceshading -opacity \
+            -ambient -diffuse -specularlevel -specularexponent \
+            -xcutplanevisible -ycutplanevisible -zcutplanevisible \
             -current
 
@@ -972 +975 @@
         }
     }
-    # Outline seems to need to be reset every update.
-    InitSettings -outlinevisible -cutplanesvisible
+
     # nothing to send -- activate the proper ivol
     SendCmd "volume state 0"
@@ -1290 +1292 @@
             }
         }
-        "-outlinevisible" {
-            SendCmd "volume outline state $_settings($what)"
-        }
         "-outlinecolor" {
             set rgb [Color2RGB $_settings($what)]
             SendCmd "volume outline color $rgb"
+        }
+        "-outlinevisible" {
+            SendCmd "volume outline state $_settings($what)"
+        }
+        "-specularexponent" {
+            set _settings($_current${what}) $_settings($what)
+            set val $_settings($what)
+            foreach tag [GetDatasetsWithComponent $_current] {
+                SendCmd "volume shading specularExp $val $tag"
+            }
         }
         "-specularlevel" {
@@ -1303 +1312 @@
             foreach tag [GetDatasetsWithComponent $_current] {
                 SendCmd "volume shading specularLevel $val $tag"
-            }
-        }
-        "-specularexponent" {
-            set _settings($_current${what}) $_settings($what)
-            set val $_settings($what)
-            foreach tag [GetDatasetsWithComponent $_current] {
-                SendCmd "volume shading specularExp $val $tag"
             }
         }