Changeset 5172 for branches/1.4/gui/scripts/vtkisosurfaceviewer.tcl

Timestamp:

Mar 29, 2015, 7:51:30 PM (9 years ago)

Author:

ldelgass

Message:

merge r5156 from trunk

Location:

branches/1.4

Files:

• . (modified) (1 prop)
• gui/scripts/vtkisosurfaceviewer.tcl (modified) (3 diffs)

branches/1.4/gui/scripts/vtkisosurfaceviewer.tcl

@@ -149 +149 @@
     private variable _changed
     private variable _initialStyle;     # Array of initial component styles.
-    private variable _reset 1;          # indicates if camera needs to be reset
-                                        # to starting position.
+    private variable _reset 1;          # Connection to server has been reset.
 
     private variable _first ""     ;    # This is the topmost dataset.
@@ -881 +880 @@
         return 0
     }
+    set _reset 1
     set result [VisViewer::Connect $_hosts]
     if { $result } {
@@ -1139 +1139 @@
         Zoom reset
         foreach axis { x y z } {
-            # Another problem fixed by a <view>. We looking into a data
-            # object for the name of the axes. This should be global to
-            # the viewer itself.
-            set label [$_first hints ${axis}label]
+            set label ""
+            if { $_first != "" } {
+                set label [$_first hints ${axis}label]
+            }
             if { $label == "" } {
                 set label [string toupper $axis]