Changeset 6371 for branches/multichoice/gui/scripts/nanovisviewer.tcl

Timestamp:

Jun 2, 2016, 8:19:06 AM (8 years ago)

Author:

dkearney

Message:

merging changes from trunk into multichoice branch

Location:

branches/multichoice

Files:

• . (modified) (1 prop)
• gui/scripts/nanovisviewer.tcl (modified) (8 diffs)

branches/multichoice/gui/scripts/nanovisviewer.tcl

@@ -119 +119 @@
 
     private variable _arcball ""
-    private variable _dlist ""         ;# list of data objects
-    private variable _obj2ovride       ;# maps dataobj => style override
-    private variable _datasets         ;# contains all the dataobj-component
-                                       ;# to volumes in the server
-
-    private variable _reset 1          ;# Connection to server has been reset.
-    private variable _click            ;# Info used for rotate operations.
-    private variable _limits           ;# Autoscale min/max for all axes
-    private variable _view             ;# View params for 3D view
+    private variable _dlist "";         # list of data objects
+    private variable _obj2ovride;       # maps dataobj => style override
+    private variable _datasets;         # maps dataobj-component
+                                        # to volumes in the server
+
+    private variable _reset 1;          # Connection to server has been reset.
+    private variable _click;            # Info used for rotate operations.
+    private variable _limits;           # Autoscale min/max for all axes
+    private variable _view;             # View params for 3D view
     private variable _parsedFunction
     private variable _transferFunctionEditors
     private variable _settings
-    private variable _first ""         ;# This is the topmost volume.
-    private variable _current ""       ;# Currently selected component
-    private variable _volcomponents    ;# Maps component name to list of
-                                       ;# dataobj-component tags
-    private variable _componentsList   ;# List of components found
+    private variable _first "";         # This is the topmost volume.
+    private variable _current "";       # Currently selected component
+    private variable _volcomponents;    # Maps component name to list of
+                                        # dataobj-component tags
+    private variable _componentsList;   # List of components found
     private variable _cname2transferFunction
     private variable _cname2defaultcolormap
@@ -143 +143 @@
     private variable _resizeLegendPending 0
 
-    private common _downloadPopup      ;# download options from popup
+    private common _downloadPopup;      # download options from popup
     private common _hardcopy
 }
@@ -462 +462 @@
     set op [lindex $args 0]
     switch -- $op {
-        -objects {
+        "-objects" {
             # put the dataobj list in order according to -raise options
             set dlist $_dlist
@@ -477 +477 @@
             return $dlist
         }
-        -image {
+        "-image" {
             if {[llength $args] != 2} {
                 error "wrong # args: should be \"get -image view|legend\""
@@ -871 +871 @@
         DoResize
     }
-
+    if { $_reset } {
+        InitSettings -background -axesvisible -gridvisible
+    }
     set _first ""
     SendCmd "volume state 0"
@@ -926 +928 @@
 
     if { $_reset } {
-        InitSettings -axesvisible -gridvisible \
-            -opacity -light2side -isosurfaceshading \
+        InitSettings -opacity -light2side -isosurfaceshading \
             -ambient -diffuse -specularlevel -specularexponent \
             -current
@@ -1549 +1550 @@
         } else {
             # $n : absolute value, compute relative
-            lappend list  [expr {(double($value)-$min)/($max-$min)]}
+            lappend list [expr {(double($value)-$min)/($max-$min)}]
         }
     }
@@ -2029 +2030 @@
     radiobutton $inner.image_button -text "Image File" \
         -variable [itcl::scope _downloadPopup(format)] \
-        -font "Arial 9 " \
+        -font "Arial 9" \
         -value image
     Rappture::Tooltip::for $inner.image_button \