Changeset 3409 for trunk/gui/scripts/vtkheightmapviewer.tcl

Timestamp:

Mar 2, 2013 1:15:17 PM (11 years ago)

Author:

gah

Message:

nanovis missing _ in of _width, isosurface broke with wrong component name, streamlines default axis names changed to X, Y, and Z

File:

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

trunk/gui/scripts/vtkheightmapviewer.tcl

@@ -158 +158 @@
     private variable _fieldNames {} 
     private variable _fields 
-    private variable _curFldName "Default"
+    private variable _curFldName ""
+    private variable _curFldLabel ""
     private variable _numContours 0
     private variable _colorMode "vmag";#  Mode of colormap (vmag or scalar)
@@ -1012 +1013 @@
                 foreach { label units components } \
                     [$_first fieldinfo $fname] break
-                SendCmd "dataset maprange explicit $_limits(v) $fname"
                 $itk_component(field) choices insert end "$fname" "$label"
                 $itk_component(fieldmenu) add radiobutton -label "$label" \
-                    -value $label -variable [itcl::scope _curFldName] \
+                    -value $label -variable [itcl::scope _curFldLabel] \
                     -selectcolor red \
                     -activebackground $itk_option(-plotbackground) \
@@ -1023 +1023 @@
                 set _fields($fname) [list $label $units $components]
                 set _curFldName $fname
-            }
-        }
-        if { [array size _fields] == 1 } {
-            set _curFldName [array names _fields]
-            if { $_curFldName == "" } { 
-                puts stderr "no default name from field"
-                set _curFldName "Default"
-            }
-        }
-        $itk_component(field) value $_curFldName
+                set _curFldLabel $label
+            }
+        }
+        $itk_component(field) value $_curFldLabel
     }
     InitSettings stretchToFit
@@ -1041 +1035 @@
             SendCmd "axis lformat $axis %g"
         }
+        
         foreach axis { x y z } {
             set label [$_first hints ${axis}label]
@@ -1048 +1043 @@
                         set label [string toupper $axis]
                     } else {
-                        set label [lindex $_fields($_curFldName) 0]
+                        set label $_curFldLabel
                     }
                 } else {
@@ -1491 +1486 @@
         }
         "field" {
-            set new   [$itk_component(field) value]
-            set value [$itk_component(field) translate $new]
-            set _settings(field) $value
-            if { [info exists _fields($new)] } {
-                set _colorMode scalar
-                set _curFldName $new
+            set label [$itk_component(field) value]
+            set fname [$itk_component(field) translate $label]
+            set _settings(field) $fname
+            if { [info exists _fields($fname)] } {
+                foreach { label units components } $_fields($fname) break
+                if { $components > 1 } {
+                    set _colorMode vmag
+                } else {
+                    set _colorMode scalar
+                }
+                set _curFldName $fname
+                set _curFldLabel $label
             } else {
-                puts stderr "unknown field \"$new\""
+                puts stderr "unknown field \"$fname\""
                 return
             }
@@ -1610 +1611 @@
         return
     }
-    if { [info exists _fields($_curFldName)] } {
-        set title [lindex $_fields($_curFldName) 0]
-        if { $title != "component" } {
-            set h [expr $h - ($lineht + 2)]
-        }
-    } else {
-        return
-    }
     # Set the legend on the first heightmap dataset.
     if { $_currentColormap != ""  } {
@@ -1656 +1649 @@
     set bMin [expr $heightScale * $dataScale * $vmin]
     set bMax [expr $heightScale * $dataScale * $vmax]
-    set fieldName $_curFldName
-    SendCmd "dataset maprange explicit $_limits(v) $fieldName"
+    SendCmd "dataset maprange explicit $_limits(v) $_curFldName"
     SendCmd "axis bounds z $bMin $bMax"
     SendCmd "axis range z $_limits(v)"
@@ -2440 +2432 @@
         }
         invoke {
-            $itk_component(field) value $_curFldName
+            $itk_component(field) value $_curFldLabel
             AdjustSetting field
         }