Changeset 5137 for trunk

Timestamp:

Mar 14, 2015, 6:40:50 PM (10 years ago)

Author:

ldelgass

Message:

Contour/heightmap fixes for defining colormap on reset and when no valid dataset
is present.

File:

• trunk/gui/scripts/vtkheightmapviewer.tcl (modified) (7 diffs)

trunk/gui/scripts/vtkheightmapviewer.tcl

@@ -139 +139 @@
     private variable _changed
     private variable _initialStyle "";  # First found style in dataobjects.
-    private variable _reset 1;          # Indicates if camera needs to be reset
-                                        # to starting position.
-    private variable _beforeConnect 1;  # Indicates if camera needs to be reset
-                                        # to starting position.
+    private variable _reset 1;          # Indicates if the connection to the 
+                                        # render server was reset
+    private variable _beforeConnect 1;  # Indicates if we are in the constructor
+                                        # before the server connection is made
 
     private variable _first ""     ;    # This is the topmost dataset.
@@ -1019 +1019 @@
         }
     }
-    if { $_first != ""  } {
+    if { $_first != "" } {
         $itk_component(field) choices delete 0 end
         $itk_component(fieldmenu) delete 0 end
@@ -1055 +1055 @@
 
         foreach axis { x y z } {
-            if { $axis == "z" } {
-                set label [$_first hints label]
-            } else {
-                set label [$_first hints ${axis}label]
+            set label ""
+            if { $_first != "" } {
+                if { $axis == "z" } {
+                    set label [$_first hints label]
+                } else {
+                    set label [$_first hints ${axis}label]
+                }
             }
             if { $label == "" } {
@@ -1075 +1078 @@
 
             set units ""
-            if {$axis == "z" && [$_first hints ${axis}units] == ""} {
-                if {$_curFldName != ""} {
+            if { $_first != "" } {
+                if { $axis == "z" } {
+                    set units [$_first hints units]
+                } else {
+                    set units [$_first hints ${axis}units]
+                }
+            }
+            if { $units == "" && $axis == "z" } {
+                if { $_first != "" && [$_first hints zunits] != "" } {
+                    set units [$_first hints zunits]
+                } elseif { [info exists _fields($_curFldName)] } {
                     set units [lindex $_fields($_curFldName) 1]
                 }
-            } else {
-                set units [$_first hints ${axis}units]
-            }
-            if { $units != "" } {
-                # May be a space in the axis units.
-                SendCmd [list axis units $axis $units]
-            }
+            }
+            # May be a space in the axis units.
+            SendCmd [list axis units $axis $units]
         }
         #
@@ -1462 +1470 @@
                 return
             }
-            set label [$_first hints label]
+            set label ""
+            if { $_first != "" } {
+                set label [$_first hints label]
+            }
             if { $label == "" } {
                 if { [string match "component*" $_curFldName] } {
@@ -1473 +1484 @@
             SendCmd [list axis name z $label]
 
-            if { [$_first hints zunits] == "" } {
-                set units [lindex $_fields($_curFldName) 1]
-            } else {
-                set units [$_first hints zunits]
-            }
-            if { $units != "" } {
-                # May be a space in the axis units.
-                SendCmd [list axis units z $units]
-            }
+            set units ""
+            if { $_first != "" } {
+                set units [$_first hints units]
+            }
+            if { $units == "" } {
+                if { $_first != "" && [$_first hints zunits] != "" } {
+                    set units [$_first hints zunits]
+                } elseif { [info exists _fields($_curFldName)] } {
+                    set units [lindex $_fields($_curFldName) 1]
+                }
+            }
+            # May be a space in the axis units.
+            SendCmd [list axis units z $units]
             # Get the new limits because the field changed.
             ResetAxes
@@ -1721 +1736 @@
     if { $_currentColormap != ""  } {
         set cmap $_currentColormap
+        if { ![info exists _colormaps($cmap)] } {
+           BuildColormap $cmap
+           set _colormaps($name) 1
+        }
         #SendCmd "legend $cmap scalar $_curFldName {} $w $h 0"
         SendCmd "legend2 $cmap $w $h"