Changeset 5007 for branches/1.4

Timestamp:

Feb 11, 2015, 3:10:11 PM (10 years ago)

Author:

ldelgass

Message:

merge -r4998:r5006 from trunk (whitespace)

Location:

branches/1.4

Files:

• . (modified) (1 prop)
• gui/scripts/field.tcl (modified) (57 diffs)
• gui/scripts/mesh.tcl (modified) (44 diffs)
• gui/scripts/visviewer.tcl (modified) (33 diffs)
• gui/scripts/vtkheightmapviewer.tcl (modified) (88 diffs)
• gui/scripts/vtkimageviewer.tcl (modified) (78 diffs)
• gui/scripts/vtkmeshviewer.tcl (modified) (35 diffs)
• gui/scripts/vtkstreamlinesviewer.tcl (modified) (56 diffs)
• gui/scripts/vtksurfaceviewer.tcl (modified) (61 diffs)
• gui/scripts/vtkviewer.tcl (modified) (56 diffs)

branches/1.4/gui/scripts/field.tcl

@@ -1 @@
-# -*- mode: tcl; indent-tabs-mode: nil -*- 
+# -*- mode: tcl; indent-tabs-mode: nil -*-
 # ----------------------------------------------------------------------
 #  COMPONENT: field - extracts data from an XML description of a field
@@ -25 +25 @@
 #       unirect2d       (deprecated)
 #       cloud           (x,y point coordinates) (deprecated)
-#       mesh 
+#       mesh
 # 3D Datasets
-#       vtk 
+#       vtk
 #       unirect3d       (deprecated)
 #       cloud           (x,y,z coordinates) (deprecated)
-#       mesh 
+#       mesh
 #       dx              (FIXME: make dx-to-vtk converter work)
 #       ucd avs
@@ -46 +46 @@
 # With <views>, can specify which viewer for specific datasets.  So it's OK
 # for the same dataset to be viewed in more than one way.
-#  o Any 2D dataset can be viewed as a contour/heightmap. 
+#  o Any 2D dataset can be viewed as a contour/heightmap.
 #  o Any 3D dataset can be viewed as a isosurface.
-#  o Any 2D dataset with vector data can be streamlines or flow.  
+#  o Any 2D dataset with vector data can be streamlines or flow.
 #  o Any 3D uniform rectilinear dataset can be viewed as a volume.
 #  o Any 3D dataset with vector data can be streamlines or flow.
@@ -59 +59 @@
 package require BLT
 
-namespace eval Rappture { 
-    # forward declaration 
+namespace eval Rappture {
+    # forward declaration
 }
 
@@ -68 +68 @@
     private variable _limits;           # maps axis name => {z0 z1} limits
     private variable _field ""
-    private variable _comp2fldName ;    # cname => field names.
-    private variable _comp2type ;       # cname => type (e.g. "vectors")
-    private variable _comp2size ;       # cname => # of components in element
-    private variable _comp2assoc;       # cname => association (e.g. pointdata)
+    private variable _comp2fldName ;    # cname => field names.
+    private variable _comp2type ;       # cname => type (e.g. "vectors")
+    private variable _comp2size ;       # cname => # of components in element
+    private variable _comp2assoc;       # cname => association (e.g. pointdata)
     private variable _fld2Components;   # field name => number of components
     private variable _fld2Label;        # field name => label
     private variable _fld2Units;        # field name => units
-    private variable _hints 
+    private variable _hints
     private variable _viewer "";        # Hints which viewer to use
-    private variable _xv "";            # For 1D meshes only.  Holds the points
     private variable _isValid 0;        # Indicates if the field contains
                                         # valid data.
@@ -83 +82 @@
     private variable _alwaysConvertDX 0;
 
-    constructor {xmlobj path} { 
-        # defined below 
-    }
-    destructor { 
-        # defined below 
+    constructor {xmlobj path} {
+        # defined below
+    }
+    destructor {
+        # defined below
     }
     public method blob { cname }
@@ -127 +126 @@
     }
     public method viewer {} {
-        return $_viewer 
+        return $_viewer
     }
     protected method Build {}
     protected method _getValue {expr}
 
-    private variable _path "";          # Path of this object in the XML 
+    private variable _path "";          # Path of this object in the XML
     private variable _units ""   ;      # system of units for this field
     private variable _zmax 0     ;# length of the device
@@ -144 +143 @@
     private variable _comp2style ;# maps component name => style settings
     private variable _comp2cntls ;# maps component name => x,y control points
-    private variable _comp2extents 
-    private variable _comp2limits;      #  Array of limits per component
-    private variable _type "" 
-    private variable _comp2flowhints 
-    private variable _comp2mesh 
+    private variable _comp2extents
+    private variable _comp2limits;        #  Array of limits per component
+    private variable _type ""
+    private variable _comp2flowhints
+    private variable _comp2mesh  ;# list of: mesh object, BLT vector of values
+    private variable _values ""  ;# Only used for unirect2d - list of values
     private common _counter 0    ;# counter for unique vector names
 
-    private method AvsToVtk { cname contents } 
-    private method DicomToVtk { cname contents } 
-    private method BuildPointsOnMesh { cname } 
-    protected method GetAssociation { cname } 
-    protected method GetTypeAndSize { cname } 
-    protected method ReadVtkDataSet { cname contents } 
-    private method InitHints {} 
-
-    private method VerifyVtkDataSet { contents } 
+    private method AvsToVtk { cname contents }
+    private method DicomToVtk { cname contents }
+    private method BuildPointsOnMesh { cname }
+    protected method GetAssociation { cname }
+    protected method GetTypeAndSize { cname }
+    protected method ReadVtkDataSet { cname contents }
+    private method InitHints {}
+
+    private method VerifyVtkDataSet { contents }
     private method VectorLimits { vector vectorsize {comp -1} }
-    private variable _values ""
 }
 
@@ -229 +228 @@
     }
     foreach name [array names _comp2mesh] {
-        # Data is in the form of a mesh and a vector.
-        foreach { mesh vector } $_comp2mesh($name) break
-        # Release the mesh (may be shared)
+        # Data is in the form of a mesh and a vector.
+        foreach { mesh vector } $_comp2mesh($name) break
+        # Release the mesh (may be shared)
         set class [$mesh info class]
         ${class}::release $mesh
-        # Destroy the vector
+        # Destroy the vector
         blt::vector destroy $vector
     }
@@ -285 +284 @@
     # Now handle the tests.
     switch -- $params(what) {
-        -name { 
+        -name {
             set rlist $components
         }
-        -style { 
+        -style {
             foreach cname $components {
                 if { [info exists _comp2style($cname)] } {
-                    lappend rlist $_comp2style($cname) 
+                    lappend rlist $_comp2style($cname)
                 }
             }
@@ -302 +301 @@
 # USAGE: mesh ?<name>?
 #
-# Returns a list {xvec yvec} for the specified field component <name>.
-# If the name is not specified, then it returns the vectors for the
-# overall field (sum of all components).
+# For 1D data (curve), returns a BLT vector of x values for the field
+# component <name>.  Otherwise, this method is unused
 # ----------------------------------------------------------------------
 itcl::body Rappture::Field::mesh {{cname -overall}} {
@@ -313 +311 @@
         return [lindex $_comp2xy($cname) 0]  ;# return xv
     }
-    if { [info exists _comp2vtk($cname)] } {
-        # FIXME: extract mesh from VTK file data.
-        if { $_comp2dims($cname) == "1D" } {
-            return $_xv
-        } 
+    if {[info exists _comp2vtk($cname)]} {
+        # FIXME: extract mesh from VTK file data.
         error "method \"mesh\" is not implemented for VTK file data"
     }
     if {[info exists _comp2dx($cname)]} {
-        return ""  ;# no mesh -- it's embedded in the blob data
+        error "method \"mesh\" is not implemented for DX file data"
     }
     if {[info exists _comp2mesh($cname)]} {
-        return ""  ;# no mesh -- it's embedded in the value data
+        # FIXME: This only works for cloud
+        set mesh [lindex $_comp2mesh($cname) 0]
+        return [$mesh points]
     }
     if {[info exists _comp2unirect2d($cname)]} {
-        set mobj [lindex $_comp2unirect2d($cname) 0]
-        return [$mobj mesh]
+        # FIXME: unirect2d mesh is a list: xMin xMax xNum yMin yMax yNum
+        return [$_comp2unirect2d($cname) mesh]
     }
     if {[info exists _comp2unirect3d($cname)]} {
-        set mobj [lindex $_comp2unirect3d($cname) 0]
-        return [$mobj mesh]
+        # This returns a list of x,y,z points
+        return [$_comp2unirect3d($cname) mesh]
     }
     error "can't get field mesh: Unknown component \"$cname\": should be one of [join [lsort [array names _comp2dims]] {, }]"
@@ -340 +337 @@
 # USAGE: values ?<name>?
 #
-# Returns a list {xvec yvec} for the specified field component <name>.
-# If the name is not specified, then it returns the vectors for the
-# overall field (sum of all components).
+# For 1D data (curve), returns a BLT vector of field values (y coords)
+# for the field component <name>.  Otherwise, this method is unused
 # ----------------------------------------------------------------------
 itcl::body Rappture::Field::values {cname} {
@@ -351 +347 @@
         return [lindex $_comp2xy($cname) 1]  ;# return yv
     }
-    # VTK file data 
     if { [info exists _comp2vtk($cname)] } {
-        # FIXME: extract the values from the VTK file data
-        if { $_comp2dims($cname) == "1D" } {
-            return $_values
-        } 
-        error "method \"values\" is not implemented for vtk file data"
-    }
-    # Points-on-mesh
+        # FIXME: extract the values from the VTK file data
+        error "method \"values\" is not implemented for VTK file data"
+    }
+    if {[info exists _comp2dx($cname)]} {
+        error "method \"values\" is not implemented for DX file data"
+    }
     if { [info exists _comp2mesh($cname)] } {
-        set vector [lindex $_comp2mesh($cname) 1]
+        set vector [lindex $_comp2mesh($cname) 1]
         return [$vector range 0 end]
-    }
-    if {[info exists _comp2dx($cname)]} {
-        error "method \"values\" is not implemented for dx file data"
     }
     if {[info exists _comp2unirect2d($cname)]} {
@@ -373 +364 @@
         return [$_comp2unirect3d($cname) blob]
     }
-    error "can't get field values. Unknown component \"$cname\": should be [join [lsort [array names _comp2dims]] {, }]"
+    error "can't get field values. Unknown component \"$cname\": should be one of [join [lsort [array names _comp2dims]] {, }]"
 }
 
@@ -389 +380 @@
     }
     if { [info exists _comp2vtk($cname)] } {
-        error "blob not implemented for VTK file data"
+        error "blob not implemented for VTK file data"
     }
     if {[info exists _comp2dx($cname)]} {
@@ -408 +399 @@
 # USAGE: valueLimits <cname>
 #
-# Returns an array for the requested component with a list {min max} 
+# Returns an array for the requested component with a list {min max}
 # representing the limits for each axis.
 # ----------------------------------------------------------------------
@@ -432 +423 @@
             1D {
                 switch -- $which {
-                    x - xlin { 
-                        set pos 0; set log 0; set axis x 
-                    }
-                    xlog { 
-                        set pos 0; set log 1; set axis x 
-                    }
-                    y - ylin - v - vlin { 
-                        set pos 1; set log 0; set axis y 
-                    }
-                    ylog - vlog { 
-                        set pos 1; set log 1; set axis y 
-                    }
+                    x - xlin {
+                        set pos 0; set log 0; set axis x
+                    }
+                    xlog {
+                        set pos 0; set log 1; set axis x
+                    }
+                    y - ylin - v - vlin {
+                        set pos 1; set log 0; set axis y
+                    }
+                    ylog - vlog {
+                        set pos 1; set log 1; set axis y
+                    }
                     default {
                         error "bad axis \"$which\": should be x, xlin, xlog, y, ylin, ylog, v, vlin, vlog"
@@ -480 +471 @@
             default {
                 if {[info exists _comp2limits($cname)]} {
-                    array set limits $_comp2limits($cname) 
-                    switch -- $which {
+                    array set limits $_comp2limits($cname)
+                    switch -- $which {
                         x - xlin - xlog {
                             set axis x
-                            foreach {axisMin axisMax} $limits(x) break
+                            foreach {axisMin axisMax} $limits(x) break
                         }
                         y - ylin - ylog {
                             set axis y
-                            foreach {axisMin axisMax} $limits(y) break
+                            foreach {axisMin axisMax} $limits(y) break
                         }
                         z - zlin - zlog {
                             set axis z
-                            foreach {axisMin axisMax} $limits(z) break
+                            foreach {axisMin axisMax} $limits(z) break
                         }
                         v - vlin - vlog {
                             set axis v
-                            foreach {axisMin axisMax} $limits(v) break
-                        }
-                        default {
-                            if { ![info exists limits($which)] } {
-                                error "limits: unknown axis \"$which\""
-                            }
+                            foreach {axisMin axisMax} $limits(v) break
+                        }
+                        default {
+                            if { ![info exists limits($which)] } {
+                                error "limits: unknown axis \"$which\""
+                            }
                             set axis v
-                            foreach {axisMin axisMax} $limits($which) break
-                        }
-                    }
+                            foreach {axisMin axisMax} $limits($which) break
+                        }
+                    }
                 } else {
                     set axisMin 0  ;# HACK ALERT! must be OpenDX data
@@ -545 +536 @@
 itcl::body Rappture::Field::fieldlimits {} {
     foreach cname [array names _comp2limits] {
-        array set limits $_comp2limits($cname) 
+        array set limits $_comp2limits($cname)
         foreach fname [fieldnames $cname] {
             if { ![info exists limits($fname)] } {
@@ -571 +562 @@
     return ""
 }
- 
+
 # ----------------------------------------------------------------------
 # USAGE: controls get ?<name>?
@@ -779 +770 @@
         set type ""
         if { ([$_field element $cname.constant] != "" &&
-              [$_field element $cname.domain] != "") ||
-              [$_field element $cname.xy] != "" } {
+              [$_field element $cname.domain] != "") ||
+              [$_field element $cname.xy] != "" } {
             set type "1D"
         } elseif { [$_field element $cname.mesh] != "" &&
-                   [$_field element $cname.values] != ""} {
+                   [$_field element $cname.values] != ""} {
             set type "points-on-mesh"
         } elseif { [$_field element $cname.vtk] != ""} {
-            set type "vtk"
-            set viewer [$_field get "about.view"]
-            if { $viewer != "" } {
-                set _viewer $viewer
-            }
+            set type "vtk"
+            set viewer [$_field get "about.view"]
+            if { $viewer != "" } {
+                set _viewer $viewer
+            }
         } elseif {[$_field element $cname.opendx] != ""} {
             global env
             if { [info exists env(VTKVOLUME)] } {
                 set _viewer "vtkvolume"
-            } 
+            }
             set type "opendx"
         } elseif {[$_field element $cname.dx] != ""} {
@@ -807 +798 @@
         } elseif {[$_field element $cname.dicom] != ""} {
             set type "dicom"
-        }
+        }
         set _comp2style($cname) ""
         if { $type == "" } {
@@ -817 +808 @@
             set extents [$_field get $cname.extents]
         } else {
-            set extents 1 
+            set extents 1
         }
         set _comp2extents($cname) $extents
@@ -880 +871 @@
             }
         } elseif {$type == "points-on-mesh"} {
-            if { ![BuildPointsOnMesh $cname] } {
+            if { ![BuildPointsOnMesh $cname] } {
                 continue;               # Ignore this component
             }
@@ -981 +972 @@
         return 0
     }
-    # Sanity check.  Verify that all components of the field have the same 
+    # Sanity check.  Verify that all components of the field have the same
     # dimension.
     set dim ""
@@ -998 +989 @@
     #        the label and units for each field will be specified there.
     #
-    # FIXME: Test that every <field><component> has the same field names, 
+    # FIXME: Test that every <field><component> has the same field names,
     #        units, components.
     #
@@ -1070 +1061 @@
 # isunirect2d  --
 #
-# Returns if the field is a unirect2d object.  
+# Returns if the field is a unirect2d object.
 #
 itcl::body Rappture::Field::isunirect2d { } {
@@ -1079 +1070 @@
 # isunirect3d  --
 #
-# Returns if the field is a unirect3d object.  
+# Returns if the field is a unirect3d object.
 #
 itcl::body Rappture::Field::isunirect3d { } {
@@ -1088 +1079 @@
 # flowhints  --
 #
-# Returns the hints associated with a flow vector field.  
+# Returns the hints associated with a flow vector field.
 #
 itcl::body Rappture::Field::flowhints { cname } {
@@ -1100 +1091 @@
 # style  --
 #
-# Returns the style associated with a component of the field.  
+# Returns the style associated with a component of the field.
 #
 itcl::body Rappture::Field::style { cname } {
@@ -1137 +1128 @@
 # extents --
 #
-# Returns if the field is a unirect2d object.  
+# Returns if the field is a unirect2d object.
 #
 itcl::body Rappture::Field::extents {{cname -overall}} {
@@ -1153 +1144 @@
         }
         return $max
-    } 
+    }
     if { $cname == "component0"} {
         set cname [lindex [components -name] 0]
@@ -1170 +1161 @@
     set f [open "$tmpfile" "w"]
     fconfigure $f -translation binary -encoding binary
-    puts $f $contents 
+    puts $f $contents
     close $f
 
@@ -1187 +1178 @@
     set dataAttrs [$dataset GetPointData]
     if { $dataAttrs == ""} {
-        puts stderr "WARNING: No point data found in \"$_path\""
+        puts stderr "WARNING: No point data found in \"$_path\""
         rename $reader ""
         return 0
@@ -1204 +1195 @@
     set f [open "$tmpfile" "w"]
     fconfigure $f -translation binary -encoding binary
-    puts $f $contents 
+    puts $f $contents
     close $f
 
@@ -1224 +1215 @@
     set _dim 0
     if { $xmax > $xmin } {
-        incr _dim
+        incr _dim
     }
     if { $ymax > $ymin } {
-        incr _dim
+        incr _dim
     }
     if { $zmax > $zmin } {
-        incr _dim
+        incr _dim
     }
     if { $_viewer == "" } {
-        if { $_dim == 2 } {
-            set _viewer contour
-        } else {
-            set _viewer isosurface
-        }
+        if { $_dim == 2 } {
+            set _viewer contour
+        } else {
+            set _viewer isosurface
+        }
     }
     set _comp2dims($cname) ${_dim}D
@@ -1245 +1236 @@
         for { set i 0 } { $i < $numPoints } { incr i } {
             set point [$dataset GetPoint $i]
-            $xv append [lindex $point 0] 
+            $xv append [lindex $point 0]
         }
         set yv [blt::vector create \#auto]
@@ -1262 +1253 @@
         set numTuples [$array GetNumberOfTuples]
         for { set i 0 } { $i < $numTuples } { incr i } {
-            $yv append [$array GetComponent $i 0] 
+            $yv append [$array GetComponent $i 0]
         }
         $xv sort $yv
         set _comp2xy($cname) [list $xv $yv]
     }
-    lappend limits x [list $xmin $xmax] 
-    lappend limits y [list $ymin $ymax] 
+    lappend limits x [list $xmin $xmax]
+    lappend limits y [list $ymin $ymax]
     lappend limits z [list $zmin $zmax]
     set dataAttrs [$dataset GetPointData]
     if { $dataAttrs == ""} {
-        puts stderr "WARNING: No point data found in \"$_path\""
+        puts stderr "WARNING: No point data found in \"$_path\""
         rename $reader ""
         return 0
@@ -1280 +1271 @@
     set numArrays [$dataAttrs GetNumberOfArrays]
     if { $numArrays > 0 } {
-        for {set i 0} {$i < [$dataAttrs GetNumberOfArrays] } {incr i} {
-            set array [$dataAttrs GetArray $i]
-            set fname  [$dataAttrs GetArrayName $i]
-            foreach {min max} [$array GetRange -1] break
+        for {set i 0} {$i < [$dataAttrs GetNumberOfArrays] } {incr i} {
+            set array [$dataAttrs GetArray $i]
+            set fname  [$dataAttrs GetArrayName $i]
+            foreach {min max} [$array GetRange -1] break
             if {$i == 0} {
                 set vmin $min
                 set vmax $max
             }
-            lappend limits $fname [list $min $max]
+            lappend limits $fname [list $min $max]
             set _fld2Units($fname) ""
-            set _fld2Label($fname) $fname
+            set _fld2Label($fname) $fname
             # Let the VTK file override the <type> designated.
             set _fld2Components($fname) [$array GetNumberOfComponents]
             lappend _comp2fldName($cname) $fname
-        }
-    }
-    
+        }
+    }
+
     lappend limits v [list $vmin $vmax]
     set _comp2limits($cname) $limits
@@ -1306 +1297 @@
 # vtkdata --
 #
-#       Returns a string representing the mesh and field data for a specific
-#       component in the legacy VTK file format.
+#        Returns a string representing the mesh and field data for a specific
+#        component in the legacy VTK file format.
 #
 itcl::body Rappture::Field::vtkdata {cname} {
@@ -1313 +1304 @@
         set cname "component"
     }
-    # DX: Convert DX to VTK 
+    # DX: Convert DX to VTK
     if {[info exists _comp2dx($cname)]} {
         set data $_comp2dx($cname)
@@ -1319 +1310 @@
         return [Rappture::DxToVtk $data]
     }
-    # Unirect3d: isosurface 
-    if {[info exists _comp2unirect3d($cname)]} {
-        return [$_comp2unirect3d($cname) vtkdata]
-    }
-    # VTK file data: 
+    # VTK file data:
     if { [info exists _comp2vtk($cname)] } {
         return $_comp2vtk($cname)
@@ -1329 +1316 @@
     # Points on mesh:  Construct VTK file output.
     if { [info exists _comp2mesh($cname)] } {
-        # Data is in the form mesh and vector
-        foreach {mesh vector} $_comp2mesh($cname) break
+        # Data is in the form mesh and vector
+        foreach {mesh vector} $_comp2mesh($cname) break
         set label $cname
         regsub -all { } $label {_} label
-        append out "# vtk DataFile Version 3.0\n"
-        append out "[hints label]\n"
-        append out "ASCII\n"
-        append out [$mesh vtkdata]
+        append out "# vtk DataFile Version 3.0\n"
+        append out "[hints label]\n"
+        append out "ASCII\n"
+        append out [$mesh vtkdata]
 
         if { $_comp2assoc($cname) == "pointdata" } {
@@ -1377 +1364 @@
             }
         }
-        append out [$vector range 0 end] 
+        append out [$vector range 0 end]
         append out "\n"
         if 0 {
             VerifyVtkDataSet $out
         }
-        return $out
-    }
-    error "can't find vtkdata for $cname. This method should only be called by the vtkheightmap widget"
+        return $out
+    }
+    error "can't find vtkdata for $cname"
 }
 
@@ -1390 +1377 @@
 # BuildPointsOnMesh --
 #
-#       Parses the field XML description to build a mesh and values vector
-#       representing the field.  Right now we handle the deprecated types
-#       of "cloud", "unirect2d", and "unirect3d" (mostly for flows).
+#        Parses the field XML description to build a mesh and values vector
+#        representing the field.  Right now we handle the deprecated types
+#        of "cloud", "unirect2d", and "unirect3d" (mostly for flows).
 #
 itcl::body Rappture::Field::BuildPointsOnMesh {cname} {
@@ -1401 +1388 @@
     set path [$_field get $cname.mesh]
     if {[$_xmlobj element $path] == ""} {
-        # Unknown mesh designated.
-        return 0
+        # Unknown mesh designated.
+        return 0
     }
     set viewer [$_field get "about.view"]
@@ -1422 +1409 @@
     # Handle bizarre cases that hopefully will be deprecated.
     if { $element == "unirect3d" } {
-        # Special case: unirect3d (should be deprecated) + flow.
+        # Special case: unirect3d (should be deprecated) + flow.
         if { [$_field element $cname.extents] != "" } {
             set vectorsize [$_field get $cname.extents]
         } else {
-            set vectorsize 1 
+            set vectorsize 1
         }
         set _type unirect3d
-        set _dim 3
+        set _dim 3
         if { $_viewer == "" } {
             set _viewer flowvis
         }
-        set _comp2dims($cname) "3D"
-        set _comp2unirect3d($cname) \
-            [Rappture::Unirect3d \#auto $_xmlobj $_field $cname $vectorsize]
-        set _comp2style($cname) [$_field get $cname.style]
+        set _comp2dims($cname) "3D"
+        set _comp2unirect3d($cname) \
+            [Rappture::Unirect3d \#auto $_xmlobj $_field $cname $vectorsize]
+        set _comp2style($cname) [$_field get $cname.style]
         set limits {}
         foreach axis { x y z } {
             lappend limits $axis [$_comp2unirect3d($cname) limits $axis]
         }
-        # Get the data limits 
+        # Get the data limits
         set vector [$_comp2unirect3d($cname) valuesObj]
         set minmax [VectorLimits $vector $vectorsize]
@@ -1447 +1434 @@
         lappend limits v      $minmax
         set _comp2limits($cname) $limits
-        if {[$_field element $cname.flow] != ""} {
-            set _comp2flowhints($cname) \
-                [Rappture::FlowHints ::\#auto $_field $cname $_units]
-        }
-        incr _counter
-        return 1
+        if {[$_field element $cname.flow] != ""} {
+            set _comp2flowhints($cname) \
+                [Rappture::FlowHints ::\#auto $_field $cname $_units]
+        }
+        incr _counter
+        return 1
     }
     if { $element == "unirect2d" && [$_field element $cname.flow] != "" } {
-        # Special case: unirect2d (normally deprecated) + flow.
+        # Special case: unirect2d (normally deprecated) + flow.
         if { [$_field element $cname.extents] != "" } {
             set vectorsize [$_field get $cname.extents]
         } else {
-            set vectorsize 1 
+            set vectorsize 1
         }
         set _type unirect2d
-        set _dim 2
+        set _dim 2
         if { $_viewer == "" } {
             set _viewer "flowvis"
         }
-        set _comp2dims($cname) "2D"
-        set _comp2unirect2d($cname) \
-            [Rappture::Unirect2d \#auto $_xmlobj $path]
-        set _comp2style($cname) [$_field get $cname.style]
-        set _comp2flowhints($cname) \
-            [Rappture::FlowHints ::\#auto $_field $cname $_units]
-        set _values [$_field get $cname.values]
+        set _comp2dims($cname) "2D"
+        set _comp2unirect2d($cname) \
+            [Rappture::Unirect2d \#auto $_xmlobj $path]
+        set _comp2style($cname) [$_field get $cname.style]
+        set _comp2flowhints($cname) \
+            [Rappture::FlowHints ::\#auto $_field $cname $_units]
+        set _values [$_field get $cname.values]
         set limits {}
         foreach axis { x y z } {
@@ -1484 +1471 @@
         blt::vector destroy $xv
         set _comp2limits($cname) $limits
-        incr _counter
-        return 1
+        incr _counter
+        return 1
     }
     switch -- $element {
-        "cloud" {
-            set mesh [Rappture::Cloud::fetch $_xmlobj $path]
+        "cloud" {
+            set mesh [Rappture::Cloud::fetch $_xmlobj $path]
             set _type cloud
-        }
-        "mesh" {
-            set mesh [Rappture::Mesh::fetch $_xmlobj $path]
+        }
+        "mesh" {
+            set mesh [Rappture::Mesh::fetch $_xmlobj $path]
             set _type mesh
-        }           
-        "unirect2d" {
+        }
+        "unirect2d" {
             if { $_viewer == "" } {
                 set _viewer "heightmap"
             }
-            set mesh [Rappture::Unirect2d::fetch $_xmlobj $path]
+            set mesh [Rappture::Unirect2d::fetch $_xmlobj $path]
             set _type unirect2d
-        }
+        }
     }
     if { ![$mesh isvalid] } {
@@ -1510 +1497 @@
     set _dim [$mesh dimensions]
     if { $_dim == 3 } {
-        set dim 0 
+        set dim 0
         foreach axis {x y z} {
             foreach {min max} [$mesh limits $axis] {
@@ -1527 +1514 @@
         return 0
 
-        # 1D data: Create vectors for graph widget.
-        # The prophet tool currently outputs 1D clouds with fields
+        # 1D data: Create vectors for graph widget.
+        # The prophet tool currently outputs 1D clouds with fields
         # Band Structure Lab used to (see isosurface1 test in rappture-bat)
-        #
-        # Is there a natural growth path in generating output from 1D to 
-        # higher dimensions?  If there isn't, let's kill this in favor
-        # or explicitly using a <curve> instead.  Otherwise, the features
-        # (methods such as xmarkers) or the <curve> need to be added 
-        # to the <field>.
-        # 
-        #set xv [blt::vector create x$_counter]
-        #set yv [blt::vector create y$_counter]
+        #
+        # Is there a natural growth path in generating output from 1D to
+        # higher dimensions?  If there isn't, let's kill this in favor
+        # or explicitly using a <curve> instead.  Otherwise, the features
+        # (methods such as xmarkers) or the <curve> need to be added
+        # to the <field>.
+        #
+        #set xv [blt::vector create x$_counter]
+        #set yv [blt::vector create y$_counter]
 
         # This only works with a Cloud mesh type, since the points method
         # is not implemented for the Mesh object
-        #$xv set [$mesh points]
+        #$xv set [$mesh points]
         # TODO: Put field values in yv
-        #set _comp2dims($cname) "1D"
-        #set _comp2xy($cname) [list $xv $yv]
-        #incr _counter
-        #return 1
-    } 
+        #set _comp2dims($cname) "1D"
+        #set _comp2xy($cname) [list $xv $yv]
+        #incr _counter
+        #return 1
+    }
     if {$_dim == 2} {
-        # 2D data: By default surface or contour plot using heightmap widget.
-        set v [blt::vector create \#auto]
-        $v set [$_field get $cname.values]
+        # 2D data: By default surface or contour plot using heightmap widget.
+        set v [blt::vector create \#auto]
+        $v set [$_field get $cname.values]
         if { [$v length] == 0 } {
             return 0
@@ -1579 +1566 @@
             }
         }
-        set _comp2dims($cname) "[$mesh dimensions]D"
-        set _comp2mesh($cname) [list $mesh $v]
-        set _comp2style($cname) [$_field get $cname.style]
+        set _comp2dims($cname) "[$mesh dimensions]D"
+        set _comp2mesh($cname) [list $mesh $v]
+        set _comp2style($cname) [$_field get $cname.style]
         if {[$_field element $cname.flow] != ""} {
             set _comp2flowhints($cname) \
                 [Rappture::FlowHints ::\#auto $_field $cname $_units]
         }
-        incr _counter
-        array unset _comp2limits $cname
+        incr _counter
+        array unset _comp2limits $cname
         foreach axis { x y z } {
             lappend _comp2limits($cname) $axis [$mesh limits $axis]
@@ -1594 +1581 @@
         lappend _comp2limits($cname) $cname $minmax
         lappend _comp2limits($cname) v $minmax
-        return 1
-    } 
+        return 1
+    }
     if {$_dim == 3} {
-        # 3D data: By default isosurfaces plot using isosurface widget.
+        # 3D data: By default isosurfaces plot using isosurface widget.
         if { $_viewer == "" } {
             set _viewer "isosurface"
         }
-        set v [blt::vector create \#auto]
-        $v set [$_field get $cname.values]
+        set v [blt::vector create \#auto]
+        $v set [$_field get $cname.values]
         if { [$v length] == 0 } {
             return 0
@@ -1640 +1627 @@
         lappend _comp2limits($cname) $cname $minmax
         lappend _comp2limits($cname) v $minmax
-        return 1
+        return 1
     }
     error "unhandled case in field dim=$_dim element=$element"
@@ -1732 +1719 @@
         "tcoords"              2
         "tensors"              9
-        "vectors"              3 
+        "vectors"              3
     }
     set type [$_field get $cname.elemtype]
     if { $type == "" } {
         set type "scalars"
-    } 
+    }
     if { ![info exists type2components($type)] } {
         error "unknown <elemtype> \"$type\" in field"
@@ -1754 +1741 @@
         set _comp2assoc($cname) "pointdata"
         return
-    } 
+    }
     switch -- $assoc {
         "pointdata" - "celldata" - "fielddata" {

branches/1.4/gui/scripts/mesh.tcl

@@ -1 @@
-# -*- mode: tcl; indent-tabs-mode: nil -*- 
+# -*- mode: tcl; indent-tabs-mode: nil -*-
 
 # ----------------------------------------------------------------------
@@ -18 +18 @@
 package require Itcl
 
-namespace eval Rappture { 
-    # forward declaration 
+namespace eval Rappture {
+    # forward declaration
 }
 
 itcl::class Rappture::Mesh {
-    private variable _xmlobj ""  ;      # Ref to XML obj with device data
-    private variable _mesh ""    ;      # Lib obj representing this mesh
-    private variable _dim       0;      # Dimension of mesh (1, 2, or 3)
-    private variable _type "";          # Indicates the type of mesh.
-    private variable _axis2units;       # System of units for x, y, z
-    private variable _axis2labels;      # 
-    private variable _hints 
-    private variable _limits        ;   # Array of mesh limits. Keys are 
-                                        # xmin, xmax, ymin, ymax, ...
-    private variable _numPoints 0   ;   # # of points in mesh
-    private variable _numCells 0   ;    # # of cells in mesh
-    private variable _vtkdata "";       # Mesh in vtk file format.
+    private variable _xmlobj ""  ;      # Ref to XML obj with device data
+    private variable _mesh ""    ;      # Lib obj representing this mesh
+    private variable _dim        0;     # Dimension of mesh (1, 2, or 3)
+    private variable _type "";          # Indicates the type of mesh.
+    private variable _axis2units;       # System of units for x, y, z
+    private variable _axis2labels;      #
+    private variable _hints
+    private variable _limits        ;   # Array of mesh limits. Keys are
+                                        # xmin, xmax, ymin, ymax, ...
+    private variable _numPoints 0   ;   # # of points in mesh
+    private variable _numCells 0   ;    # # of cells in mesh
+    private variable _vtkdata "";       # Mesh in vtk file format.
     private variable _isValid 0;        # Indicates if the mesh is valid.
-    constructor {xmlobj path} { 
-        # defined below 
-    }
-    destructor { 
-        # defined below 
+    constructor {xmlobj path} {
+        # defined below
+    }
+    destructor {
+        # defined below
     }
     public method points {}
@@ -58 +58 @@
     public method vtkdata {{what -partial}}
     public method type {} {
-        return $_type
+        return $_type
     }
     public method numpoints {} {
-        return $_numPoints
+        return $_numPoints
     }
     public method numcells {} {
-        return $_numCells
-    }
-
-    private common _xp2obj       ;      # used for fetch/release ref counting
-    private common _obj2ref      ;      # used for fetch/release ref counting
-    private variable _xv        ""
-    private variable _yv        ""
-    private variable _zv        ""
-    private variable _xCoords   "";     # For the blt contour only
-    private variable _yCoords   "";     # For the blt contour only
-    
+        return $_numCells
+    }
+
+    private common _xp2obj       ;        # used for fetch/release ref counting
+    private common _obj2ref      ;        # used for fetch/release ref counting
+    private variable _xv        ""
+    private variable _yv        ""
+    private variable _zv        ""
+    private variable _xCoords        "";  # For the blt contour only
+    private variable _yCoords        "";  # For the blt contour only
+
     private method ReadNodesElements {path}
-    private method GetDimension { path } 
-    private method GetDouble { path } 
-    private method GetInt { path } 
-    private method InitHints {} 
+    private method GetDimension { path }
+    private method GetDouble { path }
+    private method GetInt { path }
+    private method InitHints {}
     private method ReadGrid { path }
     private method ReadUnstructuredGrid { path }
@@ -164 +164 @@
     foreach u $units axis { x y z } {
         if { $u != "" } {
-            set _axis2units($axis) $u 
+            set _axis2units($axis) $u
         } else {
-            set _axis2units($axis) $first 
+            set _axis2units($axis) $first
         }
     }
@@ -179 +179 @@
     # Meshes comes in a variety of flavors
     #
-    # Dimensionality is determined from the <dimension> tag.  
+    # Dimensionality is determined from the <dimension> tag.
     #
     # <vtk> described mesh
     # <element> +  <node> definitions
-    # <grid>            rectangular mesh 
+    # <grid>            rectangular mesh
     # <unstructured>    homogeneous cell type mesh.
 
@@ -189 +189 @@
     set subcount 0
     foreach cname [$_mesh children] {
-        foreach type { vtk grid unstructured } {
-            if { $cname == $type } {
-                incr subcount
-                break
-            } 
-        }
+        foreach type { vtk grid unstructured } {
+            if { $cname == $type } {
+                incr subcount
+                break
+            }
+        }
     }
     if {[$_mesh element "node"] != "" ||
@@ -206 +206 @@
     }
     if { $subcount > 1 } {
-        puts stderr "WARNING: too many mesh types specified for \"$path\"."
+        puts stderr "WARNING: too many mesh types specified for \"$path\"."
         return
     }
     set result 0
     if { [$_mesh element "vtk"] != ""} {
-        set result [ReadVtk $path]
+        set result [ReadVtk $path]
     } elseif {[$_mesh element "grid"] != "" } {
-        set result [ReadGrid $path]
+        set result [ReadGrid $path]
     } elseif {[$_mesh element "unstructured"] != "" } {
-        set result [ReadUnstructuredGrid $path]
+        set result [ReadUnstructuredGrid $path]
     } elseif {[$_mesh element "node"] != "" && [$_mesh element "element"] != ""} {
         set result [ReadNodesElements $path]
@@ -231 +231 @@
 
     if { $_xCoords != "" } {
-        blt::vector destroy $_xCoords
+        blt::vector destroy $_xCoords
     }
     if { $_yCoords != "" } {
-        blt::vector destroy $_yCoords
-    }
-}
-
-#
-# vtkdata -- 
-#
-#       This is called by the field object to generate a VTK file to send to
-#       the remote render server.  Returns the vtkDataSet object containing
-#       (at this point) just the mesh.  The field object doesn't know (or
-#       care) what type of mesh is used.  The field object will add field
-#       arrays before generating output to send to the remote render server.
+        blt::vector destroy $_yCoords
+    }
+}
+
+#
+# vtkdata --
+#
+#        This is called by the field object to generate a VTK file to send to
+#        the remote render server.  Returns the vtkDataSet object containing
+#        (at this point) just the mesh.  The field object doesn't know (or
+#        care) what type of mesh is used.  The field object will add field
+#        arrays before generating output to send to the remote render server.
 #
 itcl::body Rappture::Mesh::vtkdata {{what -partial}} {
     if {$what == "-full"} {
         append out "# vtk DataFile Version 3.0\n"
-        append out "[hints label]\n"
-        append out "ASCII\n"
+        append out "[hints label]\n"
+        append out "ASCII\n"
         append out $_vtkdata
         return $out
@@ -340 +340 @@
 itcl::body Rappture::Mesh::mesh { {type "vtk"} } {
     switch $type {
-        "vtk" { 
-            return ""
-        }
-        default { 
-            error "Requested mesh type \"$type\" is unknown."
-        }
+        "vtk" {
+            return ""
+        }
+        default {
+            error "Requested mesh type \"$type\" is unknown."
+        }
     }
 }
@@ -443 +443 @@
     set string [$_xmlobj get $path.dim]
     if { $string == "" } {
-        puts stderr "WARNING: no tag <dim> found in mesh \"$path\"."
+        puts stderr "WARNING: no tag <dim> found in mesh \"$path\"."
         return 0
     }
@@ -479 +479 @@
         return 0
     }
-    # Create a VTK file with the mesh in it.  
+    # Create a VTK file with the mesh in it.
     set _vtkdata [$_xmlobj get $path.vtk]
     append out "# vtk DataFile Version 3.0\n"
@@ -521 +521 @@
     set numCurvilinear 0
     foreach axis { x y z } {
-        set min    [$_xmlobj get "$path.grid.${axis}axis.min"]
-        set max    [$_xmlobj get "$path.grid.${axis}axis.max"]
-        set num    [$_xmlobj get "$path.grid.${axis}axis.numpoints"]
-        set coords [$_xmlobj get "$path.grid.${axis}coords"]
-        set dim    [$_xmlobj get "$path.grid.${axis}dim"]
-        if { $min != "" && $max != "" && $num != "" && $num > 0 } {
-            set ${axis}Min $min
-            set ${axis}Max $max
-            set ${axis}Num $num
+        set min    [$_xmlobj get "$path.grid.${axis}axis.min"]
+        set max    [$_xmlobj get "$path.grid.${axis}axis.max"]
+        set num    [$_xmlobj get "$path.grid.${axis}axis.numpoints"]
+        set coords [$_xmlobj get "$path.grid.${axis}coords"]
+        set dim    [$_xmlobj get "$path.grid.${axis}dim"]
+        if { $min != "" && $max != "" && $num != "" && $num > 0 } {
+            set ${axis}Min $min
+            set ${axis}Max $max
+            set ${axis}Num $num
             if {$min > $max} {
                 puts stderr "ERROR: grid $axis axis minimum larger than maximum"
                 return 0
             }
-            incr numUniform
-        } elseif { $coords != "" } {
-            incr numRectilinear
-            set ${axis}Coords $coords
-        } elseif { $dim != "" } {
+            incr numUniform
+        } elseif { $coords != "" } {
+            incr numRectilinear
+            set ${axis}Coords $coords
+        } elseif { $dim != "" } {
             set ${axis}Num $dim
             incr numCurvilinear
@@ -545 +545 @@
     set _dim [expr $numRectilinear + $numUniform + $numCurvilinear]
     if { $_dim == 0 } {
-        # No data found.
+        # No data found.
         puts stderr "WARNING: bad grid \"$path\": no data found"
-        return 0
+        return 0
     }
     if { $numCurvilinear > 0 } {
@@ -560 +560 @@
             return 0
         }
-        if { ![info exists xNum] } {
+        if { ![info exists xNum] } {
             puts stderr "WARNING: bad grid \"$path\": invalid dimensions for curvilinear grid: missing <xdim> from grid description."
             return 0
@@ -572 +572 @@
         if { [info exists zNum] } {
             set _dim 3
-            set _numPoints [expr $xNum * $yNum * $zNum]
+            set _numPoints [expr $xNum * $yNum * $zNum]
             set _numCells [expr ($xNum > 1 ? ($xNum - 1) : 1) * ($yNum > 1 ? ($yNum - 1) : 1) * ($zNum > 1 ? ($zNum - 1) : 1)]
             if { ($_numPoints*3) != $numCoords } {
@@ -583 +583 @@
             }
             $all split $xv $yv $zv
-            foreach axis {x y z} {
+            foreach axis {x y z} {
                 set vector [set ${axis}v]
                 set _limits($axis) [$vector limits]
-            }
-            append out "DATASET STRUCTURED_GRID\n"
-            append out "DIMENSIONS $xNum $yNum $zNum\n"
-            append out "POINTS $_numPoints double\n"
+            }
+            append out "DATASET STRUCTURED_GRID\n"
+            append out "DIMENSIONS $xNum $yNum $zNum\n"
+            append out "POINTS $_numPoints double\n"
             append out [$all range 0 end]
             append out "\n"
-            set _vtkdata $out
+            set _vtkdata $out
         } elseif { [info exists yNum] } {
             set _dim 2
-            set _numPoints [expr $xNum * $yNum]
+            set _numPoints [expr $xNum * $yNum]
             set _numCells [expr ($xNum > 1 ? ($xNum - 1) : 1) * ($yNum > 1 ? ($yNum - 1) : 1)]
             if { ($_numPoints*2) != $numCoords } {
@@ -605 +605 @@
                 return 0
             }
-            foreach axis {x y} {
+            foreach axis {x y} {
                 set vector [set ${axis}v]
                 set _limits($axis) [$vector limits]
-            }
+            }
             set _limits(z) [list 0 0]
             $zv seq 0 0 [$xv length]
             $all merge $xv $yv $zv
-            append out "DATASET STRUCTURED_GRID\n"
-            append out "DIMENSIONS $xNum $yNum 1\n"
-            append out "POINTS $_numPoints double\n"
+            append out "DATASET STRUCTURED_GRID\n"
+            append out "DIMENSIONS $xNum $yNum 1\n"
+            append out "POINTS $_numPoints double\n"
             append out [$all range 0 end]
             append out "\n"
-            set _vtkdata $out
+            set _vtkdata $out
         } else {
             set _dim 1
@@ -632 +632 @@
             $zv seq 0 0 [$xv length]
             $all merge $xv $yv $zv
-            append out "DATASET STRUCTURED_GRID\n"
-            append out "DIMENSIONS $xNum 1 1\n"
-            append out "POINTS $_numPoints double\n"
+            append out "DATASET STRUCTURED_GRID\n"
+            append out "DIMENSIONS $xNum 1 1\n"
+            append out "POINTS $_numPoints double\n"
             append out [$all range 0 end]
             append out "\n"
-            set _vtkdata $out
-        }
+            set _vtkdata $out
+        }
         blt::vector destroy $all $xv $yv $zv
-        return 1
+        return 1
     }
     if { $numRectilinear == 0 && $numUniform > 0} {
-        # This is the special case where all axes 2D/3D are uniform.  
+        # This is the special case where all axes 2D/3D are uniform.
         # This results in a STRUCTURED_POINTS
         if { $_dim == 1 } {
@@ -651 +651 @@
                 set xSpace [expr ($xMax - $xMin) / double($xNum - 1)]
             }
-            set _numPoints $xNum
+            set _numPoints $xNum
             set _numCells [expr $xNum - 1]
-            append out "DATASET STRUCTURED_POINTS\n"
-            append out "DIMENSIONS $xNum 1 1\n"
-            append out "ORIGIN $xMin 0 0\n"
-            append out "SPACING $xSpace 0 0\n"
-            set _vtkdata $out
+            append out "DATASET STRUCTURED_POINTS\n"
+            append out "DIMENSIONS $xNum 1 1\n"
+            append out "ORIGIN $xMin 0 0\n"
+            append out "SPACING $xSpace 0 0\n"
+            set _vtkdata $out
             set _limits(x) [list $xMin $xMax]
             set _limits(y) [list 0 0]
             set _limits(z) [list 0 0]
-        } elseif { $_dim == 2 } {
+        } elseif { $_dim == 2 } {
             if {$xNum == 1} {
                 set xSpace 0
@@ -672 +672 @@
                 set ySpace [expr ($yMax - $yMin) / double($yNum - 1)]
             }
-            set _numPoints [expr $xNum * $yNum]
+            set _numPoints [expr $xNum * $yNum]
             set _numCells [expr ($xNum > 1 ? ($xNum - 1) : 1) * ($yNum > 1 ? ($yNum - 1) : 1)]
-            append out "DATASET STRUCTURED_POINTS\n"
-            append out "DIMENSIONS $xNum $yNum 1\n"
-            append out "ORIGIN $xMin $yMin 0\n"
-            append out "SPACING $xSpace $ySpace 0\n"
-            set _vtkdata $out
-            foreach axis {x y} {
-                set _limits($axis) [list [set ${axis}Min] [set ${axis}Max]]
-            }
+            append out "DATASET STRUCTURED_POINTS\n"
+            append out "DIMENSIONS $xNum $yNum 1\n"
+            append out "ORIGIN $xMin $yMin 0\n"
+            append out "SPACING $xSpace $ySpace 0\n"
+            set _vtkdata $out
+            foreach axis {x y} {
+                set _limits($axis) [list [set ${axis}Min] [set ${axis}Max]]
+            }
             set _limits(z) [list 0 0]
-        } elseif { $_dim == 3 } {
+        } elseif { $_dim == 3 } {
             if {$xNum == 1} {
                 set xSpace 0
@@ -699 +699 @@
                 set zSpace [expr ($zMax - $zMin) / double($zNum - 1)]
             }
-            set _numPoints [expr $xNum * $yNum * $zNum]
+            set _numPoints [expr $xNum * $yNum * $zNum]
             set _numCells [expr ($xNum > 1 ? ($xNum - 1) : 1) * ($yNum > 1 ? ($yNum - 1) : 1) * ($zNum > 1 ? ($zNum - 1) : 1)]
-            append out "DATASET STRUCTURED_POINTS\n"
-            append out "DIMENSIONS $xNum $yNum $zNum\n"
-            append out "ORIGIN $xMin $yMin $zMin\n"
-            append out "SPACING $xSpace $ySpace $zSpace\n"
-            set _vtkdata $out
-            foreach axis {x y z} {
-                set _limits($axis) [list [set ${axis}Min] [set ${axis}Max]]
-            }
-        } else { 
-            puts stderr "WARNING: bad grid \"$path\": bad dimension \"$_dim\""
+            append out "DATASET STRUCTURED_POINTS\n"
+            append out "DIMENSIONS $xNum $yNum $zNum\n"
+            append out "ORIGIN $xMin $yMin $zMin\n"
+            append out "SPACING $xSpace $ySpace $zSpace\n"
+            set _vtkdata $out
+            foreach axis {x y z} {
+                set _limits($axis) [list [set ${axis}Min] [set ${axis}Max]]
+            }
+        } else {
+            puts stderr "WARNING: bad grid \"$path\": bad dimension \"$_dim\""
             return 0
-        }
-        return 1
+        }
+        return 1
     }
     # This is the hybrid case.  Some axes are uniform, others are nonuniform.
     set xv [blt::vector create \#auto]
     if { [info exists xMin] } {
-        $xv seq $xMin $xMax $xNum
-    } else {
-        $xv set [$_xmlobj get $path.grid.xcoords]
-        set xMin [$xv min]
-        set xMax [$xv max]
-        set xNum [$xv length]
+        $xv seq $xMin $xMax $xNum
+    } else {
+        $xv set [$_xmlobj get $path.grid.xcoords]
+        set xMin [$xv min]
+        set xMax [$xv max]
+        set xNum [$xv length]
     }
     set yv [blt::vector create \#auto]
@@ -740 +740 @@
     set zv [blt::vector create \#auto]
     if { $_dim == 3 } {
-        if { [info exists zMin] } {
-            $zv seq $zMin $zMax $zNum
-        }  else {
-            $zv set [$_xmlobj get $path.grid.zcoords]
-            set zMin [$zv min]
-            set zMax [$zv max]
-            set zNum [$zv length]
-        }
-    } else {
-        set zNum 1
+        if { [info exists zMin] } {
+            $zv seq $zMin $zMax $zNum
+        }  else {
+            $zv set [$_xmlobj get $path.grid.zcoords]
+            set zMin [$zv min]
+            set zMax [$zv max]
+            set zNum [$zv length]
+        }
+    } else {
+        set zNum 1
     }
     if { $_dim == 3 } {
-        set _numPoints [expr $xNum * $yNum * $zNum]
+        set _numPoints [expr $xNum * $yNum * $zNum]
         set _numCells [expr ($xNum > 1 ? ($xNum - 1) : 1) * ($yNum > 1 ? ($yNum - 1) : 1) * ($zNum > 1 ? ($zNum - 1) : 1)]
-        append out "DATASET RECTILINEAR_GRID\n"
-        append out "DIMENSIONS $xNum $yNum $zNum\n"
-        append out "X_COORDINATES $xNum double\n"
-        append out [$xv range 0 end]
-        append out "\n"
-        append out "Y_COORDINATES $yNum double\n"
-        append out [$yv range 0 end]
-        append out "\n"
-        append out "Z_COORDINATES $zNum double\n"
-        append out [$zv range 0 end]
-        append out "\n"
-        set _vtkdata $out
-        foreach axis {x y z} {
-            if { [info exists ${axis}Min] } {
-                set _limits($axis) [list [set ${axis}Min] [set ${axis}Max]]
-            }
-        }
+        append out "DATASET RECTILINEAR_GRID\n"
+        append out "DIMENSIONS $xNum $yNum $zNum\n"
+        append out "X_COORDINATES $xNum double\n"
+        append out [$xv range 0 end]
+        append out "\n"
+        append out "Y_COORDINATES $yNum double\n"
+        append out [$yv range 0 end]
+        append out "\n"
+        append out "Z_COORDINATES $zNum double\n"
+        append out [$zv range 0 end]
+        append out "\n"
+        set _vtkdata $out
+        foreach axis {x y z} {
+            if { [info exists ${axis}Min] } {
+                set _limits($axis) [list [set ${axis}Min] [set ${axis}Max]]
+            }
+        }
     } elseif { $_dim == 2 } {
-        set _numPoints [expr $xNum * $yNum]
+        set _numPoints [expr $xNum * $yNum]
         set _numCells [expr ($xNum > 1 ? ($xNum - 1) : 1) * ($yNum > 1 ? ($yNum - 1) : 1)]
-        append out "DATASET RECTILINEAR_GRID\n"
-        append out "DIMENSIONS $xNum $yNum 1\n"
-        append out "X_COORDINATES $xNum double\n"
-        append out [$xv range 0 end]
-        append out "\n"
-        append out "Y_COORDINATES $yNum double\n"
-        append out [$yv range 0 end]
-        append out "\n"
-        append out "Z_COORDINATES 1 double\n"
-        append out "0\n"
-        foreach axis {x y} {
-            if { [info exists ${axis}Min] } {
-                set _limits($axis) [list [set ${axis}Min] [set ${axis}Max]]
-            }
-        }
+        append out "DATASET RECTILINEAR_GRID\n"
+        append out "DIMENSIONS $xNum $yNum 1\n"
+        append out "X_COORDINATES $xNum double\n"
+        append out [$xv range 0 end]
+        append out "\n"
+        append out "Y_COORDINATES $yNum double\n"
+        append out [$yv range 0 end]
+        append out "\n"
+        append out "Z_COORDINATES 1 double\n"
+        append out "0\n"
+        foreach axis {x y} {
+            if { [info exists ${axis}Min] } {
+                set _limits($axis) [list [set ${axis}Min] [set ${axis}Max]]
+            }
+        }
         set _limits(z) [list 0 0]
-        set _vtkdata $out
+        set _vtkdata $out
     } elseif { $_dim == 1 } {
         set _numPoints $xNum
         set _numCells [expr $xNum - 1]
-        append out "DATASET RECTILINEAR_GRID\n"
-        append out "DIMENSIONS $xNum 1 1\n"
-        append out "X_COORDINATES $xNum double\n"
-        append out [$xv range 0 end]
-        append out "\n"
-        append out "Y_COORDINATES 1 double\n"
-        append out "0\n"
-        append out "Z_COORDINATES 1 double\n"
-        append out "0\n"
+        append out "DATASET RECTILINEAR_GRID\n"
+        append out "DIMENSIONS $xNum 1 1\n"
+        append out "X_COORDINATES $xNum double\n"
+        append out [$xv range 0 end]
+        append out "\n"
+        append out "Y_COORDINATES 1 double\n"
+        append out "0\n"
+        append out "Z_COORDINATES 1 double\n"
+        append out "0\n"
         if { [info exists xMin] } {
             set _limits(x) [list $xMin $xMax]
@@ -808 +808 @@
         set _limits(y) [list 0 0]
         set _limits(z) [list 0 0]
-        set _vtkdata $out
-    } else {
-        puts stderr "WARNING: bad grid \"$path\": invalid dimension \"$_dim\""
+        set _vtkdata $out
+    } else {
+        puts stderr "WARNING: bad grid \"$path\": invalid dimension \"$_dim\""
         return 0
     }
-    blt::vector destroy $xv $yv $zv 
+    blt::vector destroy $xv $yv $zv
     return 1
 }
@@ -847 +847 @@
     set celltypes {}
     foreach { a b c } $triangles {
-        append data " 3 $a $b $c\n"
-        append celltypes "5\n"
-        incr _numCells
+        append data " 3 $a $b $c\n"
+        append celltypes "5\n"
+        incr _numCells
     }
     append out "DATASET UNSTRUCTURED_GRID\n"
     append out "POINTS $_numPoints double\n"
     foreach x [$xv range 0 end] y [$yv range 0 end] z [$zv range 0 end] {
-        append out " $x $y $z\n"
+        append out " $x $y $z\n"
     }
     set count [expr $_numCells * 4]
@@ -879 +879 @@
     set celltypes {}
     foreach { a b c d } $quads {
-        append data " 4 $a $b $c $d\n"
-        append celltypes "9\n"
-        incr _numCells
+        append data " 4 $a $b $c $d\n"
+        append celltypes "9\n"
+        incr _numCells
     }
     append out "DATASET UNSTRUCTURED_GRID\n"
     append out "POINTS $_numPoints double\n"
     foreach x [$xv range 0 end] y [$yv range 0 end] z [$zv range 0 end] {
-        append out " $x $y $z\n"
+        append out " $x $y $z\n"
     }
     set count [expr $_numCells * 5]
@@ -916 +916 @@
             continue
         }
-        append data " $numIndices $line\n"
-        incr _numCells
+        append data " $numIndices $line\n"
+        incr _numCells
         set count [expr $count + $numIndices + 1]
     }
@@ -923 +923 @@
     append out "POINTS $_numPoints double\n"
     foreach x [$xv range 0 end] y [$yv range 0 end] z [$zv range 0 end] {
-        append out " $x $y $z\n"
+        append out " $x $y $z\n"
     }
     append out "VERTICES $_numCells $count\n"
@@ -950 +950 @@
             continue
         }
-        append data " $numIndices $line\n"
-        incr _numCells
+        append data " $numIndices $line\n"
+        incr _numCells
         set count [expr $count + $numIndices + 1]
     }
@@ -957 +957 @@
     append out "POINTS $_numPoints double\n"
     foreach x [$xv range 0 end] y [$yv range 0 end] z [$zv range 0 end] {
-        append out " $x $y $z\n"
+        append out " $x $y $z\n"
     }
     append out "LINES $_numCells $count\n"
@@ -984 +984 @@
             continue
         }
-        append data " $numIndices $line\n"
-        incr _numCells
+        append data " $numIndices $line\n"
+        incr _numCells
         set count [expr $count + $numIndices + 1]
     }
@@ -991 +991 @@
     append out "POINTS $_numPoints double\n"
     foreach x [$xv range 0 end] y [$yv range 0 end] z [$zv range 0 end] {
-        append out " $x $y $z\n"
+        append out " $x $y $z\n"
     }
     append out "POLYGONS $_numCells $count\n"
@@ -1018 +1018 @@
             continue
         }
-        append data " $numIndices $line\n"
-        incr _numCells
+        append data " $numIndices $line\n"
+        incr _numCells
         set count [expr $count + $numIndices + 1]
     }
@@ -1025 +1025 @@
     append out "POINTS $_numPoints double\n"
     foreach x [$xv range 0 end] y [$yv range 0 end] z [$zv range 0 end] {
-        append out " $x $y $z\n"
+        append out " $x $y $z\n"
     }
     append out "TRIANGLE_STRIPS $_numCells $count\n"
@@ -1047 +1047 @@
     set celltypes {}
     foreach { a b c d } $tetras {
-        append data " 4 $a $b $c $d\n"
-        append celltypes "10\n"
-        incr _numCells
+        append data " 4 $a $b $c $d\n"
+        append celltypes "10\n"
+        incr _numCells
     }
     append out "DATASET UNSTRUCTURED_GRID\n"
     append out "POINTS $_numPoints double\n"
     foreach x [$xv range 0 end] y [$yv range 0 end] z [$zv range 0 end] {
-        append out " $x $y $z\n"
+        append out " $x $y $z\n"
     }
     set count [expr $_numCells * 5]
@@ -1076 +1076 @@
     set celltypes {}
     foreach { a b c d e f g h } $hexas {
-        append data " 8 $a $b $c $d $e $f $g $h\n"
-        append celltypes "12\n"
-        incr _numCells
+        append data " 8 $a $b $c $d $e $f $g $h\n"
+        append celltypes "12\n"
+        incr _numCells
     }
     append out "DATASET UNSTRUCTURED_GRID\n"
     append out "POINTS $_numPoints double\n"
     foreach x [$xv range 0 end] y [$yv range 0 end] z [$zv range 0 end] {
-        append out " $x $y $z\n"
+        append out " $x $y $z\n"
     }
     set count [expr $_numCells * 9]
@@ -1105 +1105 @@
     set celltypes {}
     foreach { a b c d e f } $wedges {
-        append data " 6 $a $b $c $d $e $f\n"
-        append celltypes "13\n"
-        incr _numCells
+        append data " 6 $a $b $c $d $e $f\n"
+        append celltypes "13\n"
+        incr _numCells
     }
     append out "DATASET UNSTRUCTURED_GRID\n"
     append out "POINTS $_numPoints double\n"
     foreach x [$xv range 0 end] y [$yv range 0 end] z [$zv range 0 end] {
-        append out " $x $y $z\n"
+        append out " $x $y $z\n"
     }
     set count [expr $_numCells * 7]
@@ -1134 +1134 @@
     set celltypes {}
     foreach { a b c d e } $pyramids {
-        append data " 5 $a $b $c $d $e\n"
-        append celltypes "14\n"
-        incr _numCells
+        append data " 5 $a $b $c $d $e\n"
+        append celltypes "14\n"
+        incr _numCells
     }
     append out "DATASET UNSTRUCTURED_GRID\n"
     append out "POINTS $_numPoints double\n"
     foreach x [$xv range 0 end] y [$yv range 0 end] z [$zv range 0 end] {
-        append out " $x $y $z\n"
+        append out " $x $y $z\n"
     }
     set count [expr $_numCells * 6]
@@ -1153 +1153 @@
 
     set _vtkdata $out
-    return 1 
+    return 1
 }
 
@@ -1241 +1241 @@
     set celltypes [$_xmlobj get $path.unstructured.celltypes]
     if { $numCells == 0 && $celltypes != "" } {
-        puts stderr "WARNING: bad unstuctured grid \"$path\": no <cells> description found."
+        puts stderr "WARNING: bad unstuctured grid \"$path\": no <cells> description found."
         return 0
     }
@@ -1266 +1266 @@
         }
     }
-    # Step 2: Allow points to be specified as <points> or 
+    # Step 2: Allow points to be specified as <points> or
     #         <xcoords>, <ycoords>, <zcoords>.  Split and convert into
     #         3 vectors, one for each coordinate.
@@ -1414 +1414 @@
     set data {}
     foreach cname [$_xmlobj children -type node $path] {
-        append data "[$_xmlobj get $path.$cname]\n"
-    }   
+        append data "[$_xmlobj get $path.$cname]\n"
+    }
     Rappture::ReadPoints $data _dim points
     if { $_dim == 2 } {
-        set all [blt::vector create \#auto]
-        set xv [blt::vector create \#auto]
-        set yv [blt::vector create \#auto]
-        set zv [blt::vector create \#auto]
-        $all set $points
-        $all split $xv $yv
-        set _numPoints [$xv length]
+        set all [blt::vector create \#auto]
+        set xv [blt::vector create \#auto]
+        set yv [blt::vector create \#auto]
+        set zv [blt::vector create \#auto]
+        $all set $points
+        $all split $xv $yv
+        set _numPoints [$xv length]
         set _limits(x) [$xv limits]
         set _limits(y) [$yv limits]
         set _limits(z) [list 0 0]
-        # 2D Dataset. All Z coordinates are 0
-        $zv seq 0.0 0.0 $_numPoints
-        $all merge $xv $yv $zv
-        set points [$all range 0 end]
-        blt::vector destroy $all $xv $yv $zv
+        # 2D Dataset. All Z coordinates are 0
+        $zv seq 0.0 0.0 $_numPoints
+        $all merge $xv $yv $zv
+        set points [$all range 0 end]
+        blt::vector destroy $all $xv $yv $zv
     } elseif { $_dim == 3 } {
-        set all [blt::vector create \#auto]
-        set xv [blt::vector create \#auto]
-        set yv [blt::vector create \#auto]
-        set zv [blt::vector create \#auto]
-        $all set $points
-        $all split $xv $yv $zv
-        set _numPoints [$xv length]
+        set all [blt::vector create \#auto]
+        set xv [blt::vector create \#auto]
+        set yv [blt::vector create \#auto]
+        set zv [blt::vector create \#auto]
+        $all set $points
+        $all split $xv $yv $zv
+        set _numPoints [$xv length]
         set _limits(x) [$xv limits]
         set _limits(y) [$yv limits]
         set _limits(z) [$zv limits]
-        set points [$all range 0 end]
-        blt::vector destroy $all $xv $yv $zv
-    } else {
-        error "bad dimension \"$_dim\" for nodes mesh"
+        set points [$all range 0 end]
+        blt::vector destroy $all $xv $yv $zv
+    } else {
+        error "bad dimension \"$_dim\" for nodes mesh"
     }
     array set node2celltype {
-        3 5
-        4 10
-        8 12
-        6 13
-        5 14
+        3 5
+        4 10
+        8 12
+        6 13
+        5 14
     }
     set count 0
@@ -1463 +1463 @@
     foreach cname [$_xmlobj children -type element $path] {
         set nodeList [$_mesh get $cname.nodes]
-        set numNodes [llength $nodeList]
-        if { ![info exists node2celltype($numNodes)] } {
-            puts stderr "WARNING: bad nodes/elements mesh \$path\": unknown number of indices \"$_numNodes\": should be 3, 4, 5, 6, or 8"
-            return 0
-        }
-        set celltype $node2celltype($numNodes)
-        append celltypes "  $celltype\n"
+        set numNodes [llength $nodeList]
+        if { ![info exists node2celltype($numNodes)] } {
+            puts stderr "WARNING: bad nodes/elements mesh \$path\": unknown number of indices \"$_numNodes\": should be 3, 4, 5, 6, or 8"
+            return 0
+        }
+        set celltype $node2celltype($numNodes)
+        append celltypes "  $celltype\n"
         if { $celltype == 12 } {
             # Formerly used voxels instead of hexahedrons. We're converting
@@ -1479 +1479 @@
             }
             set nodeList $newList
-        } 
-        append data "  $numNodes $nodeList\n"
-        incr _numCells
-        incr count $numNodes 
-        incr count;                     # One extra for the VTK celltype id.
+        }
+        append data "  $numNodes $nodeList\n"
+        incr _numCells
+        incr count $numNodes
+        incr count;                        # One extra for the VTK celltype id.
     }
 
@@ -1496 +1496 @@
     append out "\n"
     set _vtkdata $out
-    set _isValid 1 
+    set _isValid 1
 }
 

branches/1.4/gui/scripts/visviewer.tcl

@@ -1 @@
-# -*- mode: tcl; indent-tabs-mode: nil -*- 
+# -*- mode: tcl; indent-tabs-mode: nil -*-
 
 # ----------------------------------------------------------------------
-#  VisViewer - 
-#
-#  This class is the base class for the various visualization viewers 
+#  VisViewer -
+#
+#  This class is the base class for the various visualization viewers
 #  that use the nanoserver render farm.
 #
@@ -31 +31 @@
     private common _done            ;   # Used to indicate status of send.
     private variable _buffer        ;   # buffer for incoming/outgoing commands
-    private variable _initialized 
+    private variable _initialized
     private variable _isOpen 0
     private variable _afterId -1
@@ -71 +71 @@
     private method SendHelper {}
     private method SendHelper.old {}
-    private method WaitDialog { state } 
-
-    protected method ToggleConsole {} 
-    private method DebugConsole {} 
-    private method BuildConsole {} 
-    private method HideConsole {} 
-    private method TraceComm { channel {data {}} } 
-    private method SendDebugCommand {} 
+    private method WaitDialog { state }
+
+    protected method ToggleConsole {}
+    private method DebugConsole {}
+    private method BuildConsole {}
+    private method HideConsole {}
+    private method TraceComm { channel {data {}} }
+    private method SendDebugCommand {}
 
     protected method CheckConnection {}
@@ -85 +85 @@
     protected method Connect { servers }
     protected method Disconnect {}
-    protected method EnableWaitDialog { timeout } 
+    protected method EnableWaitDialog { timeout }
     protected method Euler2XYZ { theta phi psi }
     protected method Flush {}
@@ -99 +99 @@
     protected method SendEcho { channel {data ""} }
     protected method StartBufferingCommands {}
-    protected method StartWaiting {} 
+    protected method StartWaiting {}
     protected method StopBufferingCommands {}
-    protected method StopWaiting {} 
-
-    private method Waiting { option widget } 
+    protected method StopWaiting {}
+
+    private method Waiting { option widget }
 
     private proc CheckNameList { namelist }  {
@@ -197 +197 @@
     global env
     if { [info exists env(VISRECORDER)] } {
-        set _logging 1
-        if { [file exists /tmp/recording.log] } {
-            file delete /tmp/recording.log
-        }
+        set _logging 1
+        if { [file exists /tmp/recording.log] } {
+            file delete /tmp/recording.log
+        }
     }
     eval itk_initialize $args
@@ -256 +256 @@
 #    Connect to the visualization server (e.g. nanovis, pymolproxy).
 #    Creates an event callback that is triggered when we are idle
-#    (no I/O with the server) for some specified time. 
+#    (no I/O with the server) for some specified time.
 #
 itcl::body Rappture::VisViewer::Connect { servers } {
@@ -279 +279 @@
         set _hostname $server
         fconfigure $_sid -translation binary -encoding binary
-        
+
         # Read back the server identification string.
         if { [gets $_sid data] <= 0 } {
@@ -315 +315 @@
     after cancel $_afterId
     $_dispatcher cancel !timeout
-    catch {close $_sid} 
+    catch {close $_sid}
     set _sid ""
     set _buffer(in) ""
@@ -340 +340 @@
 # CheckConection --
 #
-#   This routine is called whenever we're about to send/receive data on 
-#   the socket connection to the visualization server.  If we're connected, 
-#   then reset the timeout event.  Otherwise try to reconnect to the 
+#   This routine is called whenever we're about to send/receive data on
+#   the socket connection to the visualization server.  If we're connected,
+#   then reset the timeout event.  Otherwise try to reconnect to the
 #   visualization server.
 #
@@ -398 +398 @@
     }
     puts -nonewline $_sid $_buffer(out)
-    flush $_sid 
+    flush $_sid
     set _done($this) 1;                 # Success
 }
@@ -478 +478 @@
 # StartWaiting --
 #
-#    Read some number of bytes from the visualization server. 
+#    Read some number of bytes from the visualization server.
 #
 
 itcl::body Rappture::VisViewer::StartWaiting {} {
     if { $_waitTimeout > 0 } {
-        after cancel $_afterId 
+        after cancel $_afterId
         set _afterId [after $_waitTimeout [itcl::code $this WaitDialog on]]
     }
 }
 
-itcl::body Rappture::VisViewer::StopWaiting {} { 
+itcl::body Rappture::VisViewer::StopWaiting {} {
     if { $_waitTimeout > 0 } {
         WaitDialog off
@@ -494 +494 @@
 }
 
-itcl::body Rappture::VisViewer::EnableWaitDialog { value } { 
+itcl::body Rappture::VisViewer::EnableWaitDialog { value } {
     set _waitTimeout $value
 }
@@ -501 +501 @@
 # ReceiveBytes --
 #
-#    Read some number of bytes from the visualization server. 
+#    Read some number of bytes from the visualization server.
 #
 itcl::body Rappture::VisViewer::ReceiveBytes { size } {
@@ -619 +619 @@
 }
 
-# 
+#
 # ReceiveEcho --
 #
@@ -642 +642 @@
         }
         set inner [frame $itk_component(plotarea).view.splash]
-        $inner configure -relief raised -bd 2 
+        $inner configure -relief raised -bd 2
         label $inner.text1 -text "Working...\nPlease wait." \
-            -font "Arial 10" 
-        label $inner.icon 
+            -font "Arial 10"
+        label $inner.icon
         pack $inner -expand yes -anchor c
         blt::table $inner \
             0,0 $inner.text1 -anchor w \
-            0,1 $inner.icon 
+            0,1 $inner.icon
         Waiting start $inner.icon
     } else {
@@ -709 +709 @@
     pack $f.send.l -side left
     itk_component add command {
-        entry $f.send.e -background white
+        entry $f.send.e -background white
     } {
-        ignore -background
+        ignore -background
     }
     pack $f.send.e -side left -expand yes -fill x
@@ -719 +719 @@
     pack $f.sb -side right -fill y
     itk_component add trace {
-        text $f.comm -wrap char -yscrollcommand "$f.sb set" -background white
+        text $f.comm -wrap char -yscrollcommand "$f.sb set" -background white
     } {
-        ignore -background
+        ignore -background
     }
     pack $f.comm -expand yes -fill both
@@ -729 +729 @@
 
     $itk_component(trace) tag configure error -foreground red \
-        -font -*-courier-medium-o-normal-*-*-120-*
+        -font -*-courier-medium-o-normal-*-*-120-*
     $itk_component(trace) tag configure incoming -foreground blue
 }
@@ -741 +741 @@
 itcl::body Rappture::VisViewer::ToggleConsole {} {
     if { $_debugConsole } {
-        set _debugConsole 0
+        set _debugConsole 0
     } else {
-        set _debugConsole 1
+        set _debugConsole 1
     }
     DebugConsole
@@ -751 +751 @@
 # DebugConsole --
 #
-#    Based on the value of the variable _debugConsole, turns on/off 
-#    debugging. This is done by setting/unsetting a procedure that 
-#    is called whenever new characters are received or sent on the 
+#    Based on the value of the variable _debugConsole, turns on/off
+#    debugging. This is done by setting/unsetting a procedure that
+#    is called whenever new characters are received or sent on the
 #    socket to the render server.  Additionally, the debug console
 #    is created if necessary and hidden/shown.
@@ -759 +759 @@
 itcl::body Rappture::VisViewer::DebugConsole {} {
     if { ![winfo exists .renderconsole] } {
-        BuildConsole
+        BuildConsole
     }
     if { $_debugConsole } {
-        $this configure -sendcommand [itcl::code $this TraceComm]
-        $this configure -receivecommand [itcl::code $this TraceComm]
-        wm deiconify .renderconsole
+        $this configure -sendcommand [itcl::code $this TraceComm]
+        $this configure -receivecommand [itcl::code $this TraceComm]
+        wm deiconify .renderconsole
     } else {
-        $this configure -sendcommand ""
-        $this configure -receivecommand ""
-        wm withdraw .renderconsole
+        $this configure -sendcommand ""
+        $this configure -receivecommand ""
+        wm withdraw .renderconsole
     }
 }
@@ -850 +850 @@
                 -title "Render Server Error"
             set inner [$popup component inner]
-            label $inner.summary -text "" -anchor w 
+            label $inner.summary -text "" -anchor w
 
             Rappture::Scroller $inner.scrl \
-                -xscrollmode auto -yscrollmode auto 
+                -xscrollmode auto -yscrollmode auto
             text $inner.scrl.text \
                 -font "Arial 9 " -background white -relief sunken -bd 1 \
@@ -862 +862 @@
             blt::table $inner \
                 0,0 $inner.scrl -fill both \
-                1,0 $inner.ok 
-            $inner.scrl.text tag configure normal -font "Arial 9" 
-            $inner.scrl.text tag configure italic -font "Arial 9 italic" 
+                1,0 $inner.ok
+            $inner.scrl.text tag configure normal -font "Arial 9"
+            $inner.scrl.text tag configure italic -font "Arial 9 italic"
             $inner.scrl.text tag configure bold -font "Arial 10 bold"
             $inner.scrl.text tag configure code -font "Courier 10 bold"
@@ -873 +873 @@
         set inner [$popup component inner]
         $inner.scrl.text delete 0.0 end
-        
+
         $inner.scrl.text configure -state normal
         $inner.scrl.text insert end "The following error was reported by the render server:\n\n" bold
@@ -943 +943 @@
         "blue-to-grey" {
             return {
-                0.0                     0.000 0.600 0.800 
-                0.14285714285714285     0.400 0.900 1.000 
-                0.2857142857142857      0.600 1.000 1.000 
-                0.42857142857142855     0.800 1.000 1.000 
-                0.5714285714285714      0.900 0.900 0.900 
-                0.7142857142857143      0.600 0.600 0.600 
-                0.8571428571428571      0.400 0.400 0.400 
+                0.0                     0.000 0.600 0.800
+                0.14285714285714285     0.400 0.900 1.000
+                0.2857142857142857      0.600 1.000 1.000
+                0.42857142857142855     0.800 1.000 1.000
+                0.5714285714285714      0.900 0.900 0.900
+                0.7142857142857143      0.600 0.600 0.600
+                0.8571428571428571      0.400 0.400 0.400
                 1.0                     0.200 0.200 0.200
             }
         }
         "white-to-blue" {
-            return { 
-                0.0                     0.900 1.000 1.000 
-                0.1111111111111111      0.800 0.983 1.000 
-                0.2222222222222222      0.700 0.950 1.000 
-                0.3333333333333333      0.600 0.900 1.000 
-                0.4444444444444444      0.500 0.833 1.000 
-                0.5555555555555556      0.400 0.750 1.000 
-                0.6666666666666666      0.300 0.650 1.000 
-                0.7777777777777778      0.200 0.533 1.000 
-                0.8888888888888888      0.100 0.400 1.000 
+            return {
+                0.0                     0.900 1.000 1.000
+                0.1111111111111111      0.800 0.983 1.000
+                0.2222222222222222      0.700 0.950 1.000
+                0.3333333333333333      0.600 0.900 1.000
+                0.4444444444444444      0.500 0.833 1.000
+                0.5555555555555556      0.400 0.750 1.000
+                0.6666666666666666      0.300 0.650 1.000
+                0.7777777777777778      0.200 0.533 1.000
+                0.8888888888888888      0.100 0.400 1.000
                 1.0                     0.000 0.250 1.000
             }
@@ -969 +969 @@
         "brown-to-blue" {
             return {
-                0.0                             0.200   0.100   0.000 
-                0.09090909090909091             0.400   0.187   0.000 
-                0.18181818181818182             0.600   0.379   0.210 
-                0.2727272727272727              0.800   0.608   0.480 
-                0.36363636363636365             0.850   0.688   0.595 
-                0.45454545454545453             0.950   0.855   0.808 
-                0.5454545454545454              0.800   0.993   1.000 
-                0.6363636363636364              0.600   0.973   1.000 
-                0.7272727272727273              0.400   0.940   1.000 
-                0.8181818181818182              0.200   0.893   1.000 
-                0.9090909090909091              0.000   0.667   0.800 
-                1.0                             0.000   0.480   0.600 
+                0.0                             0.200   0.100   0.000
+                0.09090909090909091             0.400   0.187   0.000
+                0.18181818181818182             0.600   0.379   0.210
+                0.2727272727272727              0.800   0.608   0.480
+                0.36363636363636365             0.850   0.688   0.595
+                0.45454545454545453             0.950   0.855   0.808
+                0.5454545454545454              0.800   0.993   1.000
+                0.6363636363636364              0.600   0.973   1.000
+                0.7272727272727273              0.400   0.940   1.000
+                0.8181818181818182              0.200   0.893   1.000
+                0.9090909090909091              0.000   0.667   0.800
+                1.0                             0.000   0.480   0.600
             }
         }
         "blue-to-brown" {
             return {
-                0.0                             0.000   0.480   0.600 
-                0.09090909090909091             0.000   0.667   0.800 
-                0.18181818181818182             0.200   0.893   1.000 
-                0.2727272727272727              0.400   0.940   1.000 
-                0.36363636363636365             0.600   0.973   1.000 
-                0.45454545454545453             0.800   0.993   1.000 
-                0.5454545454545454              0.950   0.855   0.808 
-                0.6363636363636364              0.850   0.688   0.595 
-                0.7272727272727273              0.800   0.608   0.480 
-                0.8181818181818182              0.600   0.379   0.210 
-                0.9090909090909091              0.400   0.187   0.000 
-                1.0                             0.200   0.100   0.000 
+                0.0                             0.000   0.480   0.600
+                0.09090909090909091             0.000   0.667   0.800
+                0.18181818181818182             0.200   0.893   1.000
+                0.2727272727272727              0.400   0.940   1.000
+                0.36363636363636365             0.600   0.973   1.000
+                0.45454545454545453             0.800   0.993   1.000
+                0.5454545454545454              0.950   0.855   0.808
+                0.6363636363636364              0.850   0.688   0.595
+                0.7272727272727273              0.800   0.608   0.480
+                0.8181818181818182              0.600   0.379   0.210
+                0.9090909090909091              0.400   0.187   0.000
+                1.0                             0.200   0.100   0.000
             }
         }
@@ -1034 +1034 @@
             set clist {
                 "#EE82EE"
-                "#4B0082" 
-                "blue" 
-                "#008000" 
-                "yellow" 
-                "#FFA500" 
-                "red" 
+                "#4B0082"
+                "blue"
+                "#008000"
+                "yellow"
+                "#FFA500"
+                "red"
             }
         }
         "BGYOR" {
             set clist {
-                "blue" 
-                "#008000" 
-                "yellow" 
-                "#FFA500" 
-                "red" 
+                "blue"
+                "#008000"
+                "yellow"
+                "#FFA500"
+                "red"
             }
         }
         "ROYGB" {
             set clist {
-                "red" 
-                "#FFA500" 
-                "yellow" 
-                "#008000" 
-                "blue" 
+                "red"
+                "#FFA500"
+                "yellow"
+                "#008000"
+                "blue"
             }
         }
         "RYGCB" {
             set clist {
-                "red" 
-                "yellow" 
+                "red"
+                "yellow"
                 "green"
                 "cyan"
@@ -1071 +1071 @@
         "BCGYR" {
             set clist {
-                "blue" 
+                "blue"
                 "cyan"
                 "green"
-                "yellow" 
-                "red" 
+                "yellow"
+                "red"
             }
         }
         "spectral" {
             return {
-                0.0 0.150 0.300 1.000 
-                0.1 0.250 0.630 1.000 
-                0.2 0.450 0.850 1.000 
-                0.3 0.670 0.970 1.000 
-                0.4 0.880 1.000 1.000 
-                0.5 1.000 1.000 0.750 
-                0.6 1.000 0.880 0.600 
-                0.7 1.000 0.680 0.450 
-                0.8 0.970 0.430 0.370 
-                0.9 0.850 0.150 0.196 
+                0.0 0.150 0.300 1.000
+                0.1 0.250 0.630 1.000
+                0.2 0.450 0.850 1.000
+                0.3 0.670 0.970 1.000
+                0.4 0.880 1.000 1.000
+                0.5 1.000 1.000 0.750
+                0.6 1.000 0.880 0.600
+                0.7 1.000 0.680 0.450
+                0.8 0.970 0.430 0.370
+                0.9 0.850 0.150 0.196
                 1.0 0.650 0.000 0.130
             }
@@ -1095 +1095 @@
         "green-to-magenta" {
             return {
-                0.0 0.000 0.316 0.000 
-                0.06666666666666667 0.000 0.526 0.000 
-                0.13333333333333333 0.000 0.737 0.000 
-                0.2 0.000 0.947 0.000 
-                0.26666666666666666 0.316 1.000 0.316 
-                0.3333333333333333 0.526 1.000 0.526 
-                0.4 0.737 1.000 0.737 
-                0.4666666666666667 1.000 1.000 1.000 
-                0.5333333333333333 1.000 0.947 1.000 
-                0.6 1.000 0.737 1.000 
-                0.6666666666666666 1.000 0.526 1.000 
-                0.7333333333333333 1.000 0.316 1.000 
-                0.8 0.947 0.000 0.947 
-                0.8666666666666667 0.737 0.000 0.737 
-                0.9333333333333333 0.526 0.000 0.526 
+                0.0 0.000 0.316 0.000
+                0.06666666666666667 0.000 0.526 0.000
+                0.13333333333333333 0.000 0.737 0.000
+                0.2 0.000 0.947 0.000
+                0.26666666666666666 0.316 1.000 0.316
+                0.3333333333333333 0.526 1.000 0.526
+                0.4 0.737 1.000 0.737
+                0.4666666666666667 1.000 1.000 1.000
+                0.5333333333333333 1.000 0.947 1.000
+                0.6 1.000 0.737 1.000
+                0.6666666666666666 1.000 0.526 1.000
+                0.7333333333333333 1.000 0.316 1.000
+                0.8 0.947 0.000 0.947
+                0.8666666666666667 0.737 0.000 0.737
+                0.9333333333333333 0.526 0.000 0.526
                 1.0 0.316 0.000 0.316
             }
         }
         "greyscale" {
-            return { 
+            return {
                 0.0 0.0 0.0 0.0 1.0 1.0 1.0 1.0
             }
@@ -1144 +1144 @@
 #
 itcl::body Rappture::VisViewer::StartBufferingCommands { } {
-    incr _buffering 
+    incr _buffering
     if { $_buffering == 1 } {
         set _outbuf ""
@@ -1170 +1170 @@
 #
 #       Send commands off to the rendering server.  If we're currently
-#       sending data objects to the server, buffer the commands to be 
+#       sending data objects to the server, buffer the commands to be
 #       sent later.
 #
@@ -1185 +1185 @@
 #
 #       Send commands off to the rendering server.  If we're currently
-#       sending data objects to the server, buffer the commands to be 
+#       sending data objects to the server, buffer the commands to be
 #       sent later.
 #

branches/1.4/gui/scripts/vtkheightmapviewer.tcl

@@ -1 @@
-# -*- mode: tcl; indent-tabs-mode: nil -*- 
+# -*- mode: tcl; indent-tabs-mode: nil -*-
 # ----------------------------------------------------------------------
 #  COMPONENT: vtkheightmapviewer - Vtk heightmap viewer
@@ -58 +58 @@
     public method get {args}
     public method isconnected {}
-    public method parameters {title args} { 
-        # do nothing 
+    public method parameters {title args} {
+        # do nothing
     }
     public method scale {args}
@@ -69 +69 @@
     private method BuildColormap { name }
     private method BuildContourTab {}
-    private method BuildDownloadPopup { widget command } 
+    private method BuildDownloadPopup { widget command }
     private method CameraReset {}
     private method Combo { option }
@@ -78 +78 @@
     private method DoRotate {}
     private method DrawLegend {}
-    private method EnterLegend { x y } 
-    private method EventuallyRequestLegend {} 
-    private method EventuallyResize { w h } 
+    private method EnterLegend { x y }
+    private method EventuallyRequestLegend {}
+    private method EventuallyResize { w h }
     private method EventuallyRotate { q }
-    private method GetHeightmapScale {} 
-    private method GetImage { args } 
-    private method GetVtkData { args } 
+    private method GetHeightmapScale {}
+    private method GetImage { args }
+    private method GetVtkData { args }
     private method InitSettings { args  }
-    private method IsValidObject { dataobj } 
+    private method IsValidObject { dataobj }
     private method LeaveLegend {}
-    private method MotionLegend { x y } 
+    private method MotionLegend { x y }
     private method Pan {option x y}
     private method PanCamera {}
     private method Pick {x y}
-    private method QuaternionToView { q } { 
+    private method QuaternionToView { q } {
         foreach { _view(-qw) _view(-qx) _view(-qy) _view(-qz) } $q break
     }
@@ -104 +104 @@
     private method SetCurrentColormap { color }
     private method SetLegendTip { x y }
-    private method SetObjectStyle { dataobj comp } 
+    private method SetObjectStyle { dataobj comp }
     private method SetOrientation { side }
     private method UpdateContourList {}
-    private method ViewToQuaternion {} { 
+    private method ViewToQuaternion {} {
         return [list $_view(-qw) $_view(-qx) $_view(-qy) $_view(-qz)]
     }
@@ -116 +116 @@
     private variable _obj2datasets
     private variable _obj2ovride   ;    # maps dataobj => style override
-    private variable _comp2scale;       # maps dataset to the heightmap scale.
-    private variable _datasets     ;    # contains all the dataobj-component 
+    private variable _comp2scale;       # maps dataset to the heightmap scale.
+    private variable _datasets     ;    # contains all the dataobj-component
                                    ;    # datasets in the server
     private variable _colormaps    ;    # contains all the colormaps
@@ -133 +133 @@
 
     private variable _click        ;    # info used for rotate operations
-    private variable _limits       ;    # Holds overall limits for all dataobjs 
+    private variable _limits       ;    # Holds overall limits for all dataobjs
                                         # using the viewer.
     private variable _view         ;    # view params for 3D view
@@ -158 +158 @@
     private variable _rotatePending 0
     private variable _legendPending 0
-    private variable _fieldNames {} 
-    private variable _fields 
+    private variable _fieldNames {}
+    private variable _fields
     private variable _curFldName ""
     private variable _curFldLabel ""
@@ -255 +255 @@
     } {
         usual
-        ignore -highlightthickness -borderwidth -background 
+        ignore -highlightthickness -borderwidth -background
     }
 
@@ -261 +261 @@
         menu $itk_component(plotarea).menu \
             -relief flat \
-            -tearoff no 
+            -tearoff no
     } {
         usual
@@ -281 +281 @@
 
     set _map(id) [$c create image 0 0 -anchor nw -image $_image(plot)]
-    set _map(cwidth) -1 
-    set _map(cheight) -1 
+    set _map(cwidth) -1
+    set _map(cheight) -1
     set _map(zoom) 1.0
     set _map(original) ""
@@ -350 +350 @@
         BuildCameraTab
     } errs] != 0 } {
-        global errorInfo
+        global errorInfo
         puts stderr "errs=$errs errorInfo=$errorInfo"
     }
 
-    # Hack around the Tk panewindow.  The problem is that the requested 
+    # Hack around the Tk panewindow.  The problem is that the requested
     # size of the 3d view isn't set until an image is retrieved from
     # the server.  So the panewindow uses the tiny size.
@@ -360 +360 @@
     pack forget $itk_component(view)
     blt::table $itk_component(plotarea) \
-        0,0 $itk_component(view) -fill both -reqwidth $w 
+        0,0 $itk_component(view) -fill both -reqwidth $w
     blt::table configure $itk_component(plotarea) c1 -resize none
 
@@ -444 +444 @@
 
 itcl::body Rappture::VtkHeightmapViewer::DoRotate {} {
-    SendCmd "camera orient [ViewToQuaternion]" 
+    SendCmd "camera orient [ViewToQuaternion]"
     set _rotatePending 0
 }
@@ -471 +471 @@
     if { !$_rotatePending } {
         set _rotatePending 1
-        global rotate_delay 
+        global rotate_delay
         $_dispatcher event -after $rotate_delay !rotate
     }
@@ -570 +570 @@
                     continue
                 }
-                if {[info exists _obj2ovride($dataobj-raise)] && 
+                if {[info exists _obj2ovride($dataobj-raise)] &&
                     $_obj2ovride($dataobj-raise)} {
                     set dlist [linsert $dlist 0 $dataobj]
@@ -598 +598 @@
             }
             return $dlist
-        }           
+        }
         -image {
             if {[llength $args] != 2} {
@@ -618 +618 @@
 }
 
-# 
+#
 # scale  --
 #
 #       This gets called either incrementally as new simulations are
 #       added or all at once as a sequence of heightmaps.
-#       This  accounts for all objects--even those not showing on the 
-#       screen.  Because of this, the limits are appropriate for all 
+#       This  accounts for all objects--even those not showing on the
+#       screen.  Because of this, the limits are appropriate for all
 #       objects as the user scans through data in the ResultSet viewer.
 #
@@ -816 +816 @@
     $_dispatcher cancel !legend
     # disconnected -- no more data sitting on server
-    array unset _datasets 
-    array unset _data 
-    array unset _colormaps 
-    array unset _obj2datasets 
+    array unset _datasets
+    array unset _data
+    array unset _colormaps
+    array unset _obj2datasets
     global readyForNextFrame
     set readyForNextFrame 1
@@ -851 +851 @@
         set time [clock seconds]
         set date [clock format $time]
-        #puts stderr "$date: received image [image width $_image(plot)]x[image height $_image(plot)] image>"        
+        #puts stderr "$date: received image [image width $_image(plot)]x[image height $_image(plot)] image>"
         if { $_start > 0 } {
             set finish [clock clicks -milliseconds]
@@ -922 +922 @@
     # Turn on buffering of commands to the server.  We don't want to
     # be preempted by a server disconnect/reconnect (which automatically
-    # generates a new call to Rebuild).   
+    # generates a new call to Rebuild).
     StartBufferingCommands
 
     if { $_width != $w || $_height != $h || $_reset } {
-        set _width $w
-        set _height $h
-        $_arcball resize $w $h
-        DoResize
-        if { $_settings(-stretchtofit) } {
-            AdjustSetting -stretchtofit
-        }
+        set _width $w
+        set _height $h
+        $_arcball resize $w $h
+        DoResize
+        if { $_settings(-stretchtofit) } {
+            AdjustSetting -stretchtofit
+        }
     }
     if { $_reset } {
-        #
-        # Reset the camera and other view parameters
-        #
+        #
+        # Reset the camera and other view parameters
+        #
         InitSettings -isheightmap -background
 
         # Setting a custom exponent and label format for axes is causing
-        # a problem with rounding.  Near zero ticks aren't rounded by 
+        # a problem with rounding.  Near zero ticks aren't rounded by
         # the %g format.  The VTK CubeAxes seem to currently work best
-        # when allowed to automatically set the exponent and precision 
-        # based on the axis ranges.  This does tend to result in less 
-        # visual clutter, so I think it is best to use the automatic 
+        # when allowed to automatically set the exponent and precision
+        # based on the axis ranges.  This does tend to result in less
+        # visual clutter, so I think it is best to use the automatic
         # settings by default.  We can test more fine-grained
         # controls on the axis settings tab if necessary.
@@ -951 +951 @@
         #SendCmd "axis exp 0 0 0 1"
 
-        SendCmd "axis lrot z 90"
-        $_arcball quaternion [ViewToQuaternion]
+        SendCmd "axis lrot z 90"
+        $_arcball quaternion [ViewToQuaternion]
         if {$_settings(-isheightmap) } {
             if { $_view(-ortho)} {
@@ -961 +961 @@
             DoRotate
             SendCmd "camera reset"
-        }
-        PanCamera
+        }
+        PanCamera
         StopBufferingCommands
         SendCmd "imgflush"
@@ -981 +981 @@
             if { ![info exists _datasets($tag)] } {
                 set bytes [$dataobj vtkdata $comp]
-                if 0 { 
+                if 0 {
                     set f [open /tmp/vtkheightmap.vtk "w"]
                     fconfigure $f -translation binary -encoding binary
                     puts -nonewline $f $bytes
                     close $f
-                }
+                }
                 set length [string length $bytes]
                 if { $_reportClientInfo }  {
@@ -1011 +1011 @@
                 SendCmd "dataset visible 1 $tag"
             }
-            if { ![info exists _comp2scale($tag)] || 
-                 $_comp2scale($tag) != $scale } {
-                SendCmd "heightmap heightscale $scale $tag"
-                set _comp2scale($tag) $scale
-            }
+            if { ![info exists _comp2scale($tag)] ||
+                 $_comp2scale($tag) != $scale } {
+                SendCmd "heightmap heightscale $scale $tag"
+                set _comp2scale($tag) $scale
+            }
         }
     }
     if { $_first != ""  } {
-        $itk_component(field) choices delete 0 end
-        $itk_component(fieldmenu) delete 0 end
-        array unset _fields
+        $itk_component(field) choices delete 0 end
+        $itk_component(fieldmenu) delete 0 end
+        array unset _fields
         set _curFldName ""
         foreach cname [$_first components] {
@@ -1050 +1050 @@
 
     if { $_reset } {
-        SendCmd "axis tickpos outside"
+        SendCmd "axis tickpos outside"
         #SendCmd "axis lformat all %g"
-        
-        foreach axis { x y z } {
+
+        foreach axis { x y z } {
             if { $axis == "z" } {
                 set label [$_first hints label]
@@ -1059 +1059 @@
                 set label [$_first hints ${axis}label]
             }
-            if { $label == "" } {
-                if {$axis == "z"} {
+            if { $label == "" } {
+                if {$axis == "z"} {
                     if { [string match "component*" $_curFldName] } {
                         set label [string toupper $axis]
@@ -1066 +1066 @@
                         set label $_curFldLabel
                     }
-                } else {
-                    set label [string toupper $axis]
-                }
-            }
-            # May be a space in the axis label.
-            SendCmd [list axis name $axis $label]
-
-            if {$axis == "z" && [$_first hints ${axis}units] == ""} {
+                } else {
+                    set label [string toupper $axis]
+                }
+            }
+            # May be a space in the axis label.
+            SendCmd [list axis name $axis $label]
+
+            if {$axis == "z" && [$_first hints ${axis}units] == ""} {
                 if {$_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]
-            }
-        }
-        #
-        # Reset the camera and other view parameters
-        #
-        ResetAxes
-        $_arcball quaternion [ViewToQuaternion]
+            } else {
+                set units [$_first hints ${axis}units]
+            }
+            if { $units != "" } {
+                # May be a space in the axis units.
+                SendCmd [list axis units $axis $units]
+            }
+        }
+        #
+        # Reset the camera and other view parameters
+        #
+        ResetAxes
+        $_arcball quaternion [ViewToQuaternion]
         if {$_settings(-isheightmap) } {
             if { $_view(-ortho)} {
@@ -1099 +1099 @@
             SendCmd "camera reset"
         }
-        PanCamera
-        InitSettings -xgrid -ygrid -zgrid \
-            -axisvisible -axislabels -heightmapscale -field -isheightmap \
+        PanCamera
+        InitSettings -xgrid -ygrid -zgrid \
+            -axisvisible -axislabels -heightmapscale -field -isheightmap \
             -numisolines
         if { [array size _fields] < 2 } {
@@ -1110 +1110 @@
     }
     global readyForNextFrame
-    set readyForNextFrame 0;            # Don't advance to the next frame
+    set readyForNextFrame 0;                # Don't advance to the next frame
 
     # Actually write the commands to the server socket.  If it fails, we don't
@@ -1128 +1128 @@
 itcl::body Rappture::VtkHeightmapViewer::CurrentDatasets {args} {
     set flag [lindex $args 0]
-    switch -- $flag { 
+    switch -- $flag {
         "-all" {
             if { [llength $args] > 1 } {
@@ -1147 +1147 @@
                 set dlist [get -visible]
             }
-        }           
+        }
         default {
             set dlist $args
@@ -1278 +1278 @@
     foreach tag [CurrentDatasets -visible] {
         SendCmd "dataset getscalar pixel $x $y $tag"
-    } 
+    }
 }
 
@@ -1382 +1382 @@
         "-background" {
             set bg [$itk_component(background) value]
-            array set fgcolors {
-                "black" "white"
-                "white" "black"
-                "grey"  "black"
-            }
+            array set fgcolors {
+                "black" "white"
+                "white" "black"
+                "grey"  "black"
+            }
             set fg $fgcolors($bg)
             configure -plotbackground $bg -plotforeground $fg
-            $itk_component(view) delete "legend"
+            $itk_component(view) delete "legend"
             SendCmd "screen bgcolor [Color2RGB $bg]"
             SendCmd "outline color [Color2RGB $fg]"
             SendCmd "axis color all [Color2RGB $fg]"
-            DrawLegend
+            DrawLegend
         }
         "-colormap" {
@@ -1400 +1400 @@
             set color [$itk_component(colormap) value]
             set _settings($what) $color
-            if { $color == "none" } {
-                if { $_settings(-colormapvisible) } {
-                    SendCmd "heightmap surface 0"
-                    set _settings(-colormapvisible) 0
-                }
-            } else {
-                if { !$_settings(-colormapvisible) } {
-                    SendCmd "heightmap surface 1"
-                    set _settings(-colormapvisible) 1
-                }
-                SetCurrentColormap $color
+            if { $color == "none" } {
+                if { $_settings(-colormapvisible) } {
+                    SendCmd "heightmap surface 0"
+                    set _settings(-colormapvisible) 0
+                }
+            } else {
+                if { !$_settings(-colormapvisible) } {
+                    SendCmd "heightmap surface 1"
+                    set _settings(-colormapvisible) 1
+                }
+                SetCurrentColormap $color
                 if {$_settings(-colormapdiscrete)} {
                     set numColors [expr $_settings(-numisolines) + 1]
                     SendCmd "colormap res $numColors $color"
                 }
-            }
+            }
             StopBufferingCommands
-            EventuallyRequestLegend
+            EventuallyRequestLegend
         }
         "-colormapvisible" {
@@ -1460 +1460 @@
                 return
             }
-            set label [$_first hints label]
-            if { $label == "" } {
+            set label [$_first hints label]
+            if { $label == "" } {
                 if { [string match "component*" $_curFldName] } {
                     set label Z
@@ -1467 +1467 @@
                     set label $_curFldLabel
                 }
-            }
-            # May be a space in the axis label.
-            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]
-            }
+            }
+            # May be a space in the axis label.
+            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]
+            }
             # Get the new limits because the field changed.
             ResetAxes
@@ -1489 +1489 @@
         }
         "-heightmapscale" {
-            if { $_settings(-isheightmap) } {
-                set scale [GetHeightmapScale]
-                # Have to set the datasets individually because we are 
+            if { $_settings(-isheightmap) } {
+                set scale [GetHeightmapScale]
+                # Have to set the datasets individually because we are
                 # tracking them in _comp2scale.
                 foreach dataset [CurrentDatasets -all] {
-                    SendCmd "heightmap heightscale $scale $dataset"
-                    set _comp2scale($dataset) $scale
-                }
-                ResetAxes
-            }
+                    SendCmd "heightmap heightscale $scale $dataset"
+                    set _comp2scale($dataset) $scale
+                }
+                ResetAxes
+            }
         }
         "-isheightmap" {
-            set bool $_settings($what)
+            set bool $_settings($what)
             set c $itk_component(view)
             StartBufferingCommands
@@ -1518 +1518 @@
             InitSettings -lighting -opacity -outline
             set scale [GetHeightmapScale]
-            # Have to set the datasets individually because we are 
+            # Have to set the datasets individually because we are
             # tracking them in _comp2scale.
             foreach dataset [CurrentDatasets -all] {
@@ -1524 +1524 @@
                 set _comp2scale($dataset) $scale
             }
-            if { $bool } {
-                $itk_component(lighting) configure -state normal
-                $itk_component(opacity) configure -state normal
-                $itk_component(scale) configure -state normal
-                $itk_component(opacity_l) configure -state normal
-                $itk_component(scale_l) configure -state normal
-                $itk_component(outline) configure -state disabled
+            if { $bool } {
+                $itk_component(lighting) configure -state normal
+                $itk_component(opacity) configure -state normal
+                $itk_component(scale) configure -state normal
+                $itk_component(opacity_l) configure -state normal
+                $itk_component(scale_l) configure -state normal
+                $itk_component(outline) configure -state disabled
                 if {$_view(-ortho)} {
                     SendCmd "camera mode ortho"
@@ -1536 +1536 @@
                     SendCmd "camera mode persp"
                 }
-            } else {
-                $itk_component(lighting) configure -state disabled
-                $itk_component(opacity) configure -state disabled
-                $itk_component(scale) configure -state disabled
-                $itk_component(opacity_l) configure -state disabled
-                $itk_component(scale_l) configure -state disabled
-                $itk_component(outline) configure -state normal
+            } else {
+                $itk_component(lighting) configure -state disabled
+                $itk_component(opacity) configure -state disabled
+                $itk_component(scale) configure -state disabled
+                $itk_component(opacity_l) configure -state disabled
+                $itk_component(scale_l) configure -state disabled
+                $itk_component(outline) configure -state normal
                 SendCmd "camera mode image"
             }
@@ -1556 +1556 @@
                 set q [ViewToQuaternion]
                 $_arcball quaternion $q
-                SendCmd "camera orient $q" 
+                SendCmd "camera orient $q"
             } else {
                 bind $c <ButtonPress-1> {}
@@ -1563 +1563 @@
             }
             Zoom reset
-            # Fix the mouse bindings for rotation/panning and the 
+            # Fix the mouse bindings for rotation/panning and the
             # camera mode. Ideally we'd create a bindtag for these.
             if { $bool } {
@@ -1578 +1578 @@
         "-isolinecolor" {
             set color [$itk_component(isolinecolor) value]
-            if { $color == "none" } {
-                if { $_settings(-isolinesvisible) } {
-                    SendCmd "heightmap isolines 0"
-                    set _settings(-isolinesvisible) 0
-                }
-            } else {
-                if { !$_settings(-isolinesvisible) } {
-                    SendCmd "heightmap isolines 1"
-                    set _settings(-isolinesvisible) 1
-                }
-                SendCmd "heightmap isolinecolor [Color2RGB $color]"
-            }
-            DrawLegend
+            if { $color == "none" } {
+                if { $_settings(-isolinesvisible) } {
+                    SendCmd "heightmap isolines 0"
+                    set _settings(-isolinesvisible) 0
+                }
+            } else {
+                if { !$_settings(-isolinesvisible) } {
+                    SendCmd "heightmap isolines 1"
+                    set _settings(-isolinesvisible) 1
+                }
+                SendCmd "heightmap isolinecolor [Color2RGB $color]"
+            }
+            DrawLegend
         }
         "-isolinesvisible" {
-            set bool $_settings($what)
+            set bool $_settings($what)
             SendCmd "heightmap isolines $bool"
-            DrawLegend
+            DrawLegend
         }
         "-legendvisible" {
             if { !$_settings($what) } {
-                $itk_component(view) delete legend
-            }
-            DrawLegend
+                $itk_component(view) delete legend
+            }
+            DrawLegend
         }
         "-lighting" {
-            if { $_settings(-isheightmap) } {
+            if { $_settings(-isheightmap) } {
                 set _settings(-savelighting) $_settings($what)
-                set bool $_settings($what)
-                SendCmd "heightmap lighting $bool"
-            } else {
-                SendCmd "heightmap lighting 0"
-            }
+                set bool $_settings($what)
+                SendCmd "heightmap lighting $bool"
+            } else {
+                SendCmd "heightmap lighting 0"
+            }
         }
         "-numisolines" {
@@ -1629 +1629 @@
             set _changed($what) 1
             set val [expr $_settings($what) * 0.01]
-            if { $_settings(-isheightmap) } {
+            if { $_settings(-isheightmap) } {
                 set _settings(-saveopacity) $_settings($what)
                 SendCmd "heightmap opacity $val"
             } else {
-                SendCmd "heightmap opacity 1.0"
+                SendCmd "heightmap opacity 1.0"
             }
         }
         "-outline" {
-            if { $_settings(-isheightmap) } {
-                SendCmd "outline visible 0"
+            if { $_settings(-isheightmap) } {
+                SendCmd "outline visible 0"
             } else {
                 set _settings(-saveoutline) $_settings($what)
@@ -1644 +1644 @@
                 SendCmd "outline visible $bool"
             }
-        }
+        }
         "-stretchtofit" {
-            set bool $_settings($what)
-            if { $bool } {
-                set heightScale [GetHeightmapScale]
-                if {$heightScale == 0} {
-                    SendCmd "camera aspect window"
-                } else {
-                    SendCmd "camera aspect square"
-                }
-            } else {
-                SendCmd "camera aspect native"
-            }
+            set bool $_settings($what)
+            if { $bool } {
+                set heightScale [GetHeightmapScale]
+                if {$heightScale == 0} {
+                    SendCmd "camera aspect window"
+                } else {
+                    SendCmd "camera aspect square"
+                }
+            } else {
+                SendCmd "camera aspect native"
+            }
             Zoom reset
-        }
+        }
         "-wireframe" {
             set bool $_settings($what)
@@ -1668 +1668 @@
             SendCmd "axis grid $axis $bool"
         }
-        default {
+        default {
             error "don't know how to fix $what"
         }
@@ -1678 +1678 @@
 #
 #       Request a new legend from the server.  The size of the legend
-#       is determined from the height of the canvas.  
+#       is determined from the height of the canvas.
 #
 # This should be called when
-#       1.  A new current colormap is set.
-#       2.  Window is resized.
-#       3.  The limits of the data have changed.  (Just need a redraw).
-#       4.  Number of isolines have changed. (Just need a redraw).
-#       5.  Legend becomes visible (Just need a redraw).
+#        1.  A new current colormap is set.
+#        2.  Window is resized.
+#        3.  The limits of the data have changed.  (Just need a redraw).
+#        4.  Number of isolines have changed. (Just need a redraw).
+#        5.  Legend becomes visible (Just need a redraw).
 #
 itcl::body Rappture::VtkHeightmapViewer::RequestLegend {} {
@@ -1692 +1692 @@
     set w 12
     set lineht [font metrics $font -linespace]
-    # color ramp height = (canvas height) - (min and max value lines) - 2 
+    # color ramp height = (canvas height) - (min and max value lines) - 2
     set h [expr {$_height - 2 * ($lineht + 2)}]
     set _legendHeight $h
@@ -1698 +1698 @@
     set fname $_curFldName
     if { [string match "component*" $fname] } {
-        set title ""
+        set title ""
     } else {
-        if { [info exists _fields($fname)] } {
-            foreach { title units } $_fields($fname) break
-            if { $units != "" } {
-                set title [format "%s (%s)" $title $units]
-            }
-        } else {
-            set title $fname
-        }
+        if { [info exists _fields($fname)] } {
+            foreach { title units } $_fields($fname) break
+            if { $units != "" } {
+                set title [format "%s (%s)" $title $units]
+            }
+        } else {
+            set title $fname
+        }
     }
     # If there's a title too, substract one more line
     if { $title != "" } {
-        incr h -$lineht 
+        incr h -$lineht
     }
     if { $h < 1 } {
@@ -1718 +1718 @@
     # Set the legend on the first heightmap dataset.
     if { $_currentColormap != ""  } {
-        set cmap $_currentColormap
-        #SendCmd "legend $cmap scalar $_curFldName {} $w $h 0"
+        set cmap $_currentColormap
+        #SendCmd "legend $cmap scalar $_curFldName {} $w $h 0"
         SendCmd "legend2 $cmap $w $h"
     }
@@ -1773 +1773 @@
     # Keep track of the colormaps that we build.
     if { $name != "none" && ![info exists _colormaps($name)] } {
-        BuildColormap $name 
+        BuildColormap $name
         set _colormaps($name) 1
     }
@@ -1799 +1799 @@
 itcl::configbody Rappture::VtkHeightmapViewer::mode {
     switch -- $itk_option(-mode) {
-        "heightmap" {
-            set _settings(-isheightmap) 1
-        }
-        "contour" {
-            set _settings(-isheightmap) 0
-        } 
-        default {
-            error "unknown mode settings \"$itk_option(-mode)\""
-        }
+        "heightmap" {
+            set _settings(-isheightmap) 1
+        }
+        "contour" {
+            set _settings(-isheightmap) 0
+        }
+        default {
+            error "unknown mode settings \"$itk_option(-mode)\""
+        }
     }
     if { !$_reset } {
@@ -1823 +1823 @@
             SendCmd "screen bgcolor $rgb"
         }
-        $itk_component(view) configure -background $itk_option(-plotbackground)
+        $itk_component(view) configure -background $itk_option(-plotbackground)
     }
 }
@@ -1863 +1863 @@
 
     itk_component add lighting {
-        checkbutton $inner.lighting \
-            -text "Enable Lighting" \
-            -variable [itcl::scope _settings(-lighting)] \
-            -command [itcl::code $this AdjustSetting -lighting] \
-            -font "Arial 9"
+        checkbutton $inner.lighting \
+            -text "Enable Lighting" \
+            -variable [itcl::scope _settings(-lighting)] \
+            -command [itcl::code $this AdjustSetting -lighting] \
+            -font "Arial 9"
     } {
-        ignore -font
+        ignore -font
     }
     checkbutton $inner.edges \
@@ -1905 +1905 @@
 
     itk_component add field_l {
-        label $inner.field_l -text "Field" -font "Arial 9" 
+        label $inner.field_l -text "Field" -font "Arial 9"
     } {
         ignore -font
@@ -1915 +1915 @@
         [itcl::code $this AdjustSetting -field]
 
-    label $inner.colormap_l -text "Colormap" -font "Arial 9" 
+    label $inner.colormap_l -text "Colormap" -font "Arial 9"
     itk_component add colormap {
         Rappture::Combobox $inner.colormap -width 10 -editable no
@@ -1924 +1924 @@
         [itcl::code $this AdjustSetting -colormap]
 
-    label $inner.isolinecolor_l -text "Isolines Color" -font "Arial 9" 
+    label $inner.isolinecolor_l -text "Isolines Color" -font "Arial 9"
     itk_component add isolinecolor {
         Rappture::Combobox $inner.isolinecolor -width 10 -editable no
@@ -1938 +1938 @@
         "red"                "red"              \
         "white"              "white"            \
-        "none"               "none"
+        "none"               "none"
 
     $itk_component(isolinecolor) value $_settings(-isolinecolor)
     bind $inner.isolinecolor <<Value>> \
-        [itcl::code $this AdjustSetting -isolinecolor]
-
-    label $inner.background_l -text "Background Color" -font "Arial 9" 
+        [itcl::code $this AdjustSetting -isolinecolor]
+
+    label $inner.background_l -text "Background Color" -font "Arial 9"
     itk_component add background {
         Rappture::Combobox $inner.background -width 10 -editable no
@@ -1951 +1951 @@
         "black"              "black"            \
         "white"              "white"            \
-        "grey"               "grey"             
+        "grey"               "grey"
 
     $itk_component(background) value "white"
@@ -1998 +1998 @@
         2,0 $inner.isolinecolor_l  -anchor w -pady 2  \
         2,1 $inner.isolinecolor    -anchor w -pady 2 -fill x  \
-        3,0 $inner.background_l -anchor w -pady 2 \
-        3,1 $inner.background -anchor w -pady 2  -fill x \
+        3,0 $inner.background_l -anchor w -pady 2 \
+        3,1 $inner.background -anchor w -pady 2  -fill x \
         4,0 $inner.numisolines_l -anchor w -pady 2 \
         4,1 $inner.numisolines -anchor w -pady 2 \
@@ -2041 +2041 @@
         -command [itcl::code $this AdjustSetting -axislabels] \
         -font "Arial 9"
-    label $inner.grid_l -text "Grid" -font "Arial 9" 
+    label $inner.grid_l -text "Grid" -font "Arial 9"
     checkbutton $inner.xgrid \
         -text "X" \
@@ -2063 +2063 @@
         -font "Arial 9"
 
-    label $inner.mode_l -text "Mode" -font "Arial 9" 
+    label $inner.mode_l -text "Mode" -font "Arial 9"
 
     itk_component add axisflymode {
@@ -2072 +2072 @@
         "closest_triad"   "closest" \
         "furthest_triad"  "farthest" \
-        "outer_edges"     "outer"         
+        "outer_edges"     "outer"
     $itk_component(axisflymode) value $_settings(-axisflymode)
     bind $inner.mode <<Value>> [itcl::code $this AdjustSetting -axisflymode]
@@ -2080 +2080 @@
         1,0 $inner.labels  -anchor w -cspan 4 \
         2,0 $inner.minorticks  -anchor w -cspan 4 \
-        4,0 $inner.grid_l  -anchor w \
+        4,0 $inner.grid_l  -anchor w \
         4,1 $inner.xgrid   -anchor w \
         4,2 $inner.ygrid   -anchor w \
         4,3 $inner.zgrid   -anchor w \
         5,0 $inner.mode_l  -anchor w -padx { 2 0 } \
-        5,1 $inner.mode    -fill x -cspan 3 
+        5,1 $inner.mode    -fill x -cspan 3
 
     blt::table configure $inner r* c* -resize none
@@ -2144 +2144 @@
 
 #
-#  camera -- 
+#  camera --
 #
 itcl::body Rappture::VtkHeightmapViewer::camera {option args} {
-    switch -- $option { 
+    switch -- $option {
         "show" {
             puts [array get _view]
@@ -2195 +2195 @@
 
 itcl::body Rappture::VtkHeightmapViewer::GetImage { args } {
-    if { [image width $_image(download)] > 0 && 
+    if { [image width $_image(download)] > 0 &&
          [image height $_image(download)] > 0 } {
         set bytes [$_image(download) data -format "jpeg -quality 100"]
@@ -2208 +2208 @@
         -title "[Rappture::filexfer::label downloadWord] as..."
     set inner [$popup component inner]
-    label $inner.summary -text "" -anchor w 
+    label $inner.summary -text "" -anchor w
     radiobutton $inner.vtk_button -text "VTK data file" \
         -variable [itcl::scope _downloadPopup(format)] \
         -font "Arial 9 " \
-        -value vtk  
+        -value vtk
     Rappture::Tooltip::for $inner.vtk_button "Save as VTK data file."
     radiobutton $inner.image_button -text "Image File" \
         -variable [itcl::scope _downloadPopup(format)] \
         -font "Arial 9 " \
-        -value image 
+        -value image
     Rappture::Tooltip::for $inner.image_button \
         "Save as digital image."
@@ -2238 +2238 @@
         2,0 $inner.image_button -anchor w -cspan 2 -padx { 4 0 } \
         4,1 $inner.cancel -width .9i -fill y \
-        4,0 $inner.ok -padx 2 -width .9i -fill y 
+        4,0 $inner.ok -padx 2 -width .9i -fill y
     blt::table configure $inner r3 -height 4
     blt::table configure $inner r4 -pady 4
@@ -2249 +2249 @@
 # SetObjectStyle --
 #
-#       Set the style of the heightmap/contour object.  This gets calls 
+#       Set the style of the heightmap/contour object.  This gets calls
 #       for each dataset once as it is loaded.  It can overridden by
 #       the user controls.
@@ -2340 +2340 @@
         #puts stderr "read $size bytes for [image width $_image(legend)]x[image height $_image(legend)] legend>"
         if { [catch {DrawLegend} errs] != 0 } {
-            global errorInfo
-            puts stderr "errs=$errs errorInfo=$errorInfo"
+            global errorInfo
+            puts stderr "errs=$errs errorInfo=$errorInfo"
         }
     }
@@ -2358 +2358 @@
     set font "Arial 8"
     set lineht [font metrics $font -linespace]
-    
+
     if { [string match "component*" $fname] } {
-        set title ""
+        set title ""
     } else {
-        if { [info exists _fields($fname)] } {
-            foreach { title units } $_fields($fname) break
-            if { $units != "" } {
-                set title [format "%s (%s)" $title $units]
-            }
-        } else {
-            set title $fname
-        }
+        if { [info exists _fields($fname)] } {
+            foreach { title units } $_fields($fname) break
+            if { $units != "" } {
+                set title [format "%s (%s)" $title $units]
+            }
+        } else {
+            set title $fname
+        }
     }
     set x [expr $w - 2]
     if { !$_settings(-legendvisible) } {
-        $c delete legend
-        return
-    } 
+        $c delete legend
+        return
+    }
     if { [$c find withtag "legend"] == "" } {
-        set y 2 
-        # If there's a legend title, create a text item for the title.
+        set y 2
+        # If there's a legend title, create a text item for the title.
         $c create text $x $y \
             -anchor ne \
@@ -2386 +2386 @@
             incr y $lineht
         }
-        $c create text $x $y \
+        $c create text $x $y \
             -anchor ne \
             -fill $itk_option(-plotforeground) -tags "vmax legend" \
             -font $font
         incr y $lineht
-        $c create image $x $y \
-            -anchor ne \
-            -image $_image(legend) -tags "colormap legend"
-        $c create rectangle $x $y 1 1 \
-            -fill "" -outline "" -tags "sensor legend"
-        $c create text $x [expr {$h-2}] \
-            -anchor se \
-            -fill $itk_option(-plotforeground) -tags "vmin legend" \
-            -font $font
-        $c bind sensor <Enter> [itcl::code $this EnterLegend %x %y]
-        $c bind sensor <Leave> [itcl::code $this LeaveLegend]
-        $c bind sensor <Motion> [itcl::code $this MotionLegend %x %y]
+        $c create image $x $y \
+            -anchor ne \
+            -image $_image(legend) -tags "colormap legend"
+        $c create rectangle $x $y 1 1 \
+            -fill "" -outline "" -tags "sensor legend"
+        $c create text $x [expr {$h-2}] \
+            -anchor se \
+            -fill $itk_option(-plotforeground) -tags "vmin legend" \
+            -font $font
+        $c bind sensor <Enter> [itcl::code $this EnterLegend %x %y]
+        $c bind sensor <Leave> [itcl::code $this LeaveLegend]
+        $c bind sensor <Motion> [itcl::code $this MotionLegend %x %y]
     }
     $c delete isoline
@@ -2413 +2413 @@
     # Draw the isolines on the legend.
     array unset _isolines
-    if { $color != "none"  && [info exists _limits($_curFldName)] && 
+    if { $color != "none"  && [info exists _limits($_curFldName)] &&
          $_settings(-isolinesvisible) && $_currentNumIsolines > 0 } {
 
@@ -2422 +2422 @@
         }
         set tags "isoline legend"
-        set offset [expr 2 + $lineht]
-        if { $title != "" } {
-            incr offset $lineht
-        }
+        set offset [expr 2 + $lineht]
+        if { $title != "" } {
+            incr offset $lineht
+        }
         foreach value $_contourList {
             set norm [expr 1.0 - (($value - $vmin) / $range)]
@@ -2433 +2433 @@
                 set _isolines([expr $y1 - $off]) $value
             }
-            $c create line $x1 $y1 $x2 $y1 -fill $color -tags $tags
-        }
+            $c create line $x1 $y1 $x2 $y1 -fill $color -tags $tags
+        }
     }
 
@@ -2443 +2443 @@
     if { [info exists _limits($_curFldName)] } {
         foreach { vmin vmax } $_limits($_curFldName) break
-        $c itemconfigure vmin -text [format %g $vmin]
-        $c itemconfigure vmax -text [format %g $vmax]
+        $c itemconfigure vmin -text [format %g $vmin]
+        $c itemconfigure vmax -text [format %g $vmax]
     }
     set y 2
@@ -2450 +2450 @@
     if { $title != "" } {
         $c itemconfigure title -text $title
-        $c coords title $x $y
-        incr y $lineht
+        $c coords title $x $y
+        incr y $lineht
     }
     $c coords vmax $x $y
@@ -2499 +2499 @@
     set font "Arial 8"
     set lineht [font metrics $font -linespace]
-    
+
     set ih [image height $_image(legend)]
     # Subtract off the offset of the color ramp from the top of the canvas
@@ -2505 +2505 @@
 
     if { [string match "component*" $fname] } {
-        set title ""
+        set title ""
     } else {
-        if { [info exists _fields($fname)] } {
-            foreach { title units } $_fields($fname) break
-            if { $units != "" } {
-                set title [format "%s (%s)" $title $units]
-            }
-        } else {
-            set title $fname
-        }
+        if { [info exists _fields($fname)] } {
+            foreach { title units } $_fields($fname) break
+            if { $units != "" } {
+                set title [format "%s (%s)" $title $units]
+            }
+        } else {
+            set title $fname
+        }
     }
     # If there's a legend title, increase the offset by the line height.
@@ -2530 +2530 @@
     }
     set color [eval format "\#%02x%02x%02x" $pixel]
-    $_image(swatch) put black  -to 0 0 23 23 
-    $_image(swatch) put $color -to 1 1 22 22 
+    $_image(swatch) put black  -to 0 0 23 23
+    $_image(swatch) put $color -to 1 1 22 22
 
     # Compute the value of the point
@@ -2541 +2541 @@
         set value 0.0
     }
-    set tipx [expr $x + 15] 
+    set tipx [expr $x + 15]
     set tipy [expr $y - 5]
     .rappturetooltip configure -icon $_image(swatch)
@@ -2549 +2549 @@
         Rappture::Tooltip::text $c [format "$title %g" $value]
     }
-    Rappture::Tooltip::tooltip show $c +$tipx,+$tipy    
+    Rappture::Tooltip::tooltip show $c +$tipx,+$tipy
 }
 
@@ -2564 +2564 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::VtkHeightmapViewer::Combo {option} {
-    set c $itk_component(view) 
+    set c $itk_component(view)
     switch -- $option {
         post {
@@ -2577 +2577 @@
         }
         deactivate {
-            $c itemconfigure title -fill $itk_option(-plotforeground) 
+            $c itemconfigure title -fill $itk_option(-plotforeground)
         }
         invoke {
@@ -2591 +2591 @@
 itcl::body Rappture::VtkHeightmapViewer::GetHeightmapScale {} {
     if {  $_settings(-isheightmap) } {
-        set val $_settings(-heightmapscale)
-        set sval [expr { $val >= 50 ? double($val)/50.0 : 1.0/(2.0-(double($val)/50.0)) }]
-        return $sval
-    }
-    return 0 
-}
-
-itcl::body Rappture::VtkHeightmapViewer::SetOrientation { side } { 
+        set val $_settings(-heightmapscale)
+        set sval [expr { $val >= 50 ? double($val)/50.0 : 1.0/(2.0-(double($val)/50.0)) }]
+        return $sval
+    }
+    return 0
+}
+
+itcl::body Rappture::VtkHeightmapViewer::SetOrientation { side } {
     array set positions {
         front  "0.707107 0.707107 0 0"
@@ -2609 +2609 @@
     foreach name { -qw -qx -qy -qz } value $positions($side) {
         set _view($name) $value
-    } 
+    }
     set q [ViewToQuaternion]
     $_arcball quaternion $q
@@ -2619 +2619 @@
 }
 
-itcl::body Rappture::VtkHeightmapViewer::UpdateContourList {} { 
+itcl::body Rappture::VtkHeightmapViewer::UpdateContourList {} {
     if {$_currentNumIsolines == 0} {
         set _contourList ""

branches/1.4/gui/scripts/vtkimageviewer.tcl

@@ -1 @@
-# -*- mode: tcl; indent-tabs-mode: nil -*- 
+# -*- mode: tcl; indent-tabs-mode: nil -*-
 # ----------------------------------------------------------------------
 #  COMPONENT: vtkimageviewer - Vtk image viewer
@@ -58 +58 @@
     public method get {args}
     public method isconnected {}
-    public method parameters {title args} { 
-        # do nothing 
+    public method parameters {title args} {
+        # do nothing
     }
     public method scale {args}
@@ -69 +69 @@
     private method BuildColormap { name }
     private method BuildImageTab {}
-    private method BuildDownloadPopup { widget command } 
+    private method BuildDownloadPopup { widget command }
     private method Combo { option }
     private method Connect {}
@@ -77 +77 @@
     private method DoRotate {}
     private method DrawLegend {}
-    private method EnterLegend { x y } 
-    private method EventuallyRequestLegend {} 
-    private method EventuallyResize { w h } 
+    private method EnterLegend { x y }
+    private method EventuallyRequestLegend {}
+    private method EventuallyResize { w h }
     private method EventuallyRotate { q }
-    private method GetImage { args } 
-    private method GetVtkData { args } 
+    private method GetImage { args }
+    private method GetVtkData { args }
     private method InitSettings { args  }
-    private method IsValidObject { dataobj } 
+    private method IsValidObject { dataobj }
     private method LeaveLegend {}
-    private method MotionLegend { x y } 
+    private method MotionLegend { x y }
     private method Pan {option x y}
     private method PanCamera {}
     private method Pick {x y}
-    private method QuaternionToView { q } { 
+    private method QuaternionToView { q } {
         foreach { _view(-qw) _view(-qx) _view(-qy) _view(-qz) } $q break
     }
@@ -101 +101 @@
     private method SetCurrentColormap { color }
     private method SetLegendTip { x y }
-    private method SetObjectStyle { dataobj comp } 
+    private method SetObjectStyle { dataobj comp }
     private method SetOrientation { side }
-    private method ViewToQuaternion {} { 
+    private method ViewToQuaternion {} {
         return [list $_view(-qw) $_view(-qx) $_view(-qy) $_view(-qz)]
     }
@@ -112 +112 @@
     private variable _obj2datasets
     private variable _obj2ovride   ;    # maps dataobj => style override
-    private variable _datasets     ;    # contains all the dataobj-component 
+    private variable _datasets     ;    # contains all the dataobj-component
                                    ;    # datasets in the server
     private variable _colormaps    ;    # contains all the colormaps
@@ -128 +128 @@
 
     private variable _click        ;    # info used for rotate operations
-    private variable _limits       ;    # Holds overall limits for all dataobjs 
+    private variable _limits       ;    # Holds overall limits for all dataobjs
                                         # using the viewer.
     private variable _view         ;    # view params for 3D view
@@ -153 +153 @@
     private variable _rotatePending 0
     private variable _legendPending 0
-    private variable _fieldNames {} 
-    private variable _fields 
+    private variable _fieldNames {}
+    private variable _fields
     private variable _curFldName ""
     private variable _curFldLabel ""
@@ -243 +243 @@
     } {
         usual
-        ignore -highlightthickness -borderwidth -background 
+        ignore -highlightthickness -borderwidth -background
     }
 
@@ -249 +249 @@
         menu $itk_component(plotarea).menu \
             -relief flat \
-            -tearoff no 
+            -tearoff no
     } {
         usual
@@ -269 +269 @@
 
     set _map(id) [$c create image 0 0 -anchor nw -image $_image(plot)]
-    set _map(cwidth) -1 
-    set _map(cheight) -1 
+    set _map(cwidth) -1
+    set _map(cheight) -1
     set _map(zoom) 1.0
     set _map(original) ""
@@ -338 +338 @@
         BuildCameraTab
     } errs] != 0 } {
-        global errorInfo
+        global errorInfo
         puts stderr "errs=$errs errorInfo=$errorInfo"
     }
 
-    # Hack around the Tk panewindow.  The problem is that the requested 
+    # Hack around the Tk panewindow.  The problem is that the requested
     # size of the 3d view isn't set until an image is retrieved from
     # the server.  So the panewindow uses the tiny size.
@@ -348 +348 @@
     pack forget $itk_component(view)
     blt::table $itk_component(plotarea) \
-        0,0 $itk_component(view) -fill both -reqwidth $w 
+        0,0 $itk_component(view) -fill both -reqwidth $w
     blt::table configure $itk_component(plotarea) c1 -resize none
 
@@ -432 +432 @@
 
 itcl::body Rappture::VtkImageViewer::DoRotate {} {
-    SendCmd "camera orient [ViewToQuaternion]" 
+    SendCmd "camera orient [ViewToQuaternion]"
     set _rotatePending 0
 }
@@ -459 +459 @@
     if { !$_rotatePending } {
         set _rotatePending 1
-        global rotate_delay 
+        global rotate_delay
         $_dispatcher event -after $rotate_delay !rotate
     }
@@ -558 +558 @@
                     continue
                 }
-                if {[info exists _obj2ovride($dataobj-raise)] && 
+                if {[info exists _obj2ovride($dataobj-raise)] &&
                     $_obj2ovride($dataobj-raise)} {
                     set dlist [linsert $dlist 0 $dataobj]
@@ -586 +586 @@
             }
             return $dlist
-        }           
+        }
         -image {
             if {[llength $args] != 2} {
@@ -606 +606 @@
 }
 
-# 
+#
 # scale  --
 #
 #       This gets called either incrementally as new simulations are
 #       added or all at once as a sequence of images.
-#       This  accounts for all objects--even those not showing on the 
-#       screen.  Because of this, the limits are appropriate for all 
+#       This  accounts for all objects--even those not showing on the
+#       screen.  Because of this, the limits are appropriate for all
 #       objects as the user scans through data in the ResultSet viewer.
 #
@@ -804 +804 @@
     $_dispatcher cancel !legend
     # disconnected -- no more data sitting on server
-    array unset _datasets 
-    array unset _data 
-    array unset _colormaps 
-    array unset _obj2datasets 
+    array unset _datasets
+    array unset _data
+    array unset _colormaps
+    array unset _obj2datasets
     global readyForNextFrame
     set readyForNextFrame 1
@@ -839 +839 @@
         set time [clock seconds]
         set date [clock format $time]
-        #puts stderr "$date: received image [image width $_image(plot)]x[image height $_image(plot)] image>"        
+        #puts stderr "$date: received image [image width $_image(plot)]x[image height $_image(plot)] image>"
         if { $_start > 0 } {
             set finish [clock clicks -milliseconds]
@@ -910 +910 @@
     # Turn on buffering of commands to the server.  We don't want to
     # be preempted by a server disconnect/reconnect (which automatically
-    # generates a new call to Rebuild).   
+    # generates a new call to Rebuild).
     StartBufferingCommands
 
     if { $_width != $w || $_height != $h || $_reset } {
-        set _width $w
-        set _height $h
-        $_arcball resize $w $h
-        DoResize
-        if { $_settings(-stretchtofit) } {
-            AdjustSetting -stretchToFit
-        }
+        set _width $w
+        set _height $h
+        $_arcball resize $w $h
+        DoResize
+        if { $_settings(-stretchtofit) } {
+            AdjustSetting -stretchToFit
+        }
     }
     if { $_reset } {
-        #
-        # Reset the camera and other view parameters
-        #
+        #
+        # Reset the camera and other view parameters
+        #
         InitSettings -view3d -background
 
-        SendCmd "axis lrot z 90"
-        $_arcball quaternion [ViewToQuaternion]
+        SendCmd "axis lrot z 90"
+        $_arcball quaternion [ViewToQuaternion]
         if {$_settings(-view3d) } {
             if { $_view(-ortho)} {
@@ -938 +938 @@
             DoRotate
             SendCmd "camera reset"
-        }
-        PanCamera
+        }
+        PanCamera
         StopBufferingCommands
         SendCmd "imgflush"
@@ -957 +957 @@
             if { ![info exists _datasets($tag)] } {
                 set bytes [$dataobj vtkdata $comp]
-                if 0 { 
+                if 0 {
                     set f [open /tmp/vtkimage.vtk "w"]
                     fconfigure $f -translation binary -encoding binary
                     puts -nonewline $f $bytes
                     close $f
-                }
+                }
                 set length [string length $bytes]
                 if { $_reportClientInfo }  {
@@ -990 +990 @@
     }
     if { $_first != ""  } {
-        $itk_component(field) choices delete 0 end
-        $itk_component(fieldmenu) delete 0 end
-        array unset _fields
+        $itk_component(field) choices delete 0 end
+        $itk_component(fieldmenu) delete 0 end
+        array unset _fields
         set _curFldName ""
         foreach cname [$_first components] {
@@ -1021 +1021 @@
 
     if { $_reset } {
-        SendCmd "axis tickpos outside"
+        SendCmd "axis tickpos outside"
         #SendCmd "axis lformat all %g"
-        
-        foreach axis { x y z } {
+
+        foreach axis { x y z } {
             set label [$_first hints ${axis}label]
-            if { $label == "" } {
-                set label [string toupper $axis]
-            }
-            # May be a space in the axis label.
-            SendCmd [list axis name $axis $label]
-
-            if {$axis == "z" && [$_first hints ${axis}units] == ""} {
+            if { $label == "" } {
+                set label [string toupper $axis]
+            }
+            # May be a space in the axis label.
+            SendCmd [list axis name $axis $label]
+
+            if {$axis == "z" && [$_first hints ${axis}units] == ""} {
                 if {$_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]
-            }
-        }
-        #
-        # Reset the camera and other view parameters
-        #
-        $_arcball quaternion [ViewToQuaternion]
+            } else {
+                set units [$_first hints ${axis}units]
+            }
+            if { $units != "" } {
+                # May be a space in the axis units.
+                SendCmd [list axis units $axis $units]
+            }
+        }
+        #
+        # Reset the camera and other view parameters
+        #
+        $_arcball quaternion [ViewToQuaternion]
         if {$_settings(-view3d) } {
             if { $_view(-ortho)} {
@@ -1057 +1057 @@
             SendCmd "camera reset"
         }
-        PanCamera
-        InitSettings -xgrid -ygrid -zgrid \
+        PanCamera
+        InitSettings -xgrid -ygrid -zgrid \
             -axisvisible -axislabels -field -view3d
         if { [array size _fields] < 2 } {
@@ -1067 +1067 @@
     }
     global readyForNextFrame
-    set readyForNextFrame 0;            # Don't advance to the next frame
+    set readyForNextFrame 0;                # Don't advance to the next frame
 
     # Actually write the commands to the server socket.  If it fails, we don't
@@ -1085 +1085 @@
 itcl::body Rappture::VtkImageViewer::CurrentDatasets {args} {
     set flag [lindex $args 0]
-    switch -- $flag { 
+    switch -- $flag {
         "-all" {
             if { [llength $args] > 1 } {
@@ -1104 +1104 @@
                 set dlist [get -visible]
             }
-        }           
+        }
         default {
             set dlist $args
@@ -1226 +1226 @@
     foreach tag [CurrentDatasets -visible] {
         SendCmd "dataset getscalar pixel $x $y $tag"
-    } 
+    }
 }
 
@@ -1330 +1330 @@
         "-background" {
             set bg [$itk_component(background) value]
-            array set fgcolors {
-                "black" "white"
-                "white" "black"
-                "grey"  "black"
-            }
+            array set fgcolors {
+                "black" "white"
+                "white" "black"
+                "grey"  "black"
+            }
             set fg $fgcolors($bg)
             configure -plotbackground $bg -plotforeground $fg
-            $itk_component(view) delete "legend"
+            $itk_component(view) delete "legend"
             SendCmd "screen bgcolor [Color2RGB $bg]"
             SendCmd "outline color [Color2RGB $fg]"
             SendCmd "axis color all [Color2RGB $fg]"
-            DrawLegend
+            DrawLegend
         }
         "-backingcolor" {
             set color [$itk_component(backingcolor) value]
-            if { $color == "none" } {
-                if { $_settings(-backingvisible) } {
-                    SendCmd "image backing 0"
-                    set _settings(-backingvisible) 0
-                }
-            } else {
-                if { !$_settings(-backingvisible) } {
-                    SendCmd "image backing 1"
-                    set _settings(-backingvisible) 1
-                }
-                SendCmd "image color [Color2RGB $color]"
-            }
+            if { $color == "none" } {
+                if { $_settings(-backingvisible) } {
+                    SendCmd "image backing 0"
+                    set _settings(-backingvisible) 0
+                }
+            } else {
+                if { !$_settings(-backingvisible) } {
+                    SendCmd "image backing 1"
+                    set _settings(-backingvisible) 1
+                }
+                SendCmd "image color [Color2RGB $color]"
+            }
         }
         "-backingvisible" {
-            set bool $_settings($what)
+            set bool $_settings($what)
             SendCmd "image backing $bool"
         }
@@ -1372 +1372 @@
             }
             StopBufferingCommands
-            EventuallyRequestLegend
+            EventuallyRequestLegend
         }
         "-colormapdiscrete" {
@@ -1410 +1410 @@
         }
         "-view3d" {
-            set bool $_settings($what)
+            set bool $_settings($what)
             set c $itk_component(view)
             StartBufferingCommands
@@ -1420 +1420 @@
             }
             AdjustSetting -opacity
-            if { $bool } {
-                $itk_component(opacity) configure -state normal
-                $itk_component(opacity_l) configure -state normal
+            if { $bool } {
+                $itk_component(opacity) configure -state normal
+                $itk_component(opacity_l) configure -state normal
                 if {$_view(-ortho)} {
                     SendCmd "camera mode ortho"
@@ -1429 +1429 @@
                 }
                 SendCmd "camera aspect native"
-            } else {
-                $itk_component(opacity) configure -state disabled
-                $itk_component(opacity_l) configure -state disabled
+            } else {
+                $itk_component(opacity) configure -state disabled
+                $itk_component(opacity_l) configure -state disabled
                 SendCmd "camera mode image"
                 if {$_settings(-stretchtofit)} {
@@ -1440 +1440 @@
                 set q [ViewToQuaternion]
                 $_arcball quaternion $q
-                SendCmd "camera orient $q" 
+                SendCmd "camera orient $q"
             } else {
                 bind $c <ButtonPress-1> {}
@@ -1447 +1447 @@
             }
             SendCmd "camera reset"
-            # Fix the mouse bindings for rotation/panning and the 
+            # Fix the mouse bindings for rotation/panning and the
             # camera mode. Ideally we'd create a bindtag for these.
             if { $bool } {
@@ -1470 +1470 @@
         "-legendvisible" {
             if { !$_settings($what) } {
-                $itk_component(view) delete legend
-            }
-            DrawLegend
+                $itk_component(view) delete legend
+            }
+            DrawLegend
         }
         "-opacity" {
             set _changed($what) 1
-            if { $_settings(-view3d) } {
+            if { $_settings(-view3d) } {
                 set _settings(-saveopacity) $_settings($what)
                 set val [expr $_settings($what) * 0.01]
                 SendCmd "image opacity $val"
             } else {
-                SendCmd "image opacity 1.0"
+                SendCmd "image opacity 1.0"
             }
         }
@@ -1487 +1487 @@
             set bool $_settings($what)
             SendCmd "outline visible $bool"
-        }
+        }
         "-stretchtofit" {
-            set bool $_settings($what)
-            if { $bool } {
-                if { $_settings(-view3d) } {
-                    SendCmd "camera aspect native"
-                } else {
-                    SendCmd "camera aspect window"
-                }
-            } else {
-                SendCmd "camera aspect native"
-            }
-        }
+            set bool $_settings($what)
+            if { $bool } {
+                if { $_settings(-view3d) } {
+                    SendCmd "camera aspect native"
+                } else {
+                    SendCmd "camera aspect window"
+                }
+            } else {
+                SendCmd "camera aspect native"
+            }
+        }
         "-xgrid" - "-ygrid" - "-zgrid" {
             set axis [string tolower [string range $what 1 1]]
@@ -1505 +1505 @@
             SendCmd "axis grid $axis $bool"
         }
-        default {
+        default {
             error "don't know how to fix $what"
         }
@@ -1515 +1515 @@
 #
 #       Request a new legend from the server.  The size of the legend
-#       is determined from the height of the canvas.  
+#       is determined from the height of the canvas.
 #
 # This should be called when
-#       1.  A new current colormap is set.
-#       2.  Window is resized.
-#       3.  The limits of the data have changed.  (Just need a redraw).
-#       4.  Number of isolines have changed. (Just need a redraw).
-#       5.  Legend becomes visible (Just need a redraw).
+#        1.  A new current colormap is set.
+#        2.  Window is resized.
+#        3.  The limits of the data have changed.  (Just need a redraw).
+#        4.  Number of isolines have changed. (Just need a redraw).
+#        5.  Legend becomes visible (Just need a redraw).
 #
 itcl::body Rappture::VtkImageViewer::RequestLegend {} {
@@ -1529 +1529 @@
     set w 12
     set lineht [font metrics $font -linespace]
-    # color ramp height = (canvas height) - (min and max value lines) - 2 
+    # color ramp height = (canvas height) - (min and max value lines) - 2
     set h [expr {$_height - 2 * ($lineht + 2)}]
     set _legendHeight $h
@@ -1535 +1535 @@
     set fname $_curFldName
     if { [string match "component*" $fname] } {
-        set title ""
+        set title ""
     } else {
-        if { [info exists _fields($fname)] } {
-            foreach { title units } $_fields($fname) break
-            if { $units != "" } {
-                set title [format "%s (%s)" $title $units]
-            }
-        } else {
-            set title $fname
-        }
+        if { [info exists _fields($fname)] } {
+            foreach { title units } $_fields($fname) break
+            if { $units != "" } {
+                set title [format "%s (%s)" $title $units]
+            }
+        } else {
+            set title $fname
+        }
     }
     # If there's a title too, substract one more line
     if { $title != "" } {
-        incr h -$lineht 
+        incr h -$lineht
     }
     if { $h < 1 } {
@@ -1555 +1555 @@
     # Set the legend on the first image dataset.
     if { $_currentColormap != "" && $_currentColormap != "none" } {
-        #SendCmd "legend $_currentColormap scalar $_curFldName {} $w $h 0"
+        #SendCmd "legend $_currentColormap scalar $_curFldName {} $w $h 0"
         SendCmd "legend2 $_currentColormap $w $h"
     }
@@ -1566 +1566 @@
     # Keep track of the colormaps that we build.
     if { $name != "none" && ![info exists _colormaps($name)] } {
-        BuildColormap $name 
+        BuildColormap $name
         set _colormaps($name) 1
     }
@@ -1593 +1593 @@
 itcl::configbody Rappture::VtkImageViewer::mode {
     switch -- $itk_option(-mode) {
-        "volume" {
-            set _settings(-view3d) 1
-        }
-        "vtkimage" {
-            set _settings(-view3d) 0
-        } 
-        default {
-            error "unknown mode settings \"$itk_option(-mode)\""
-        }
+        "volume" {
+            set _settings(-view3d) 1
+        }
+        "vtkimage" {
+            set _settings(-view3d) 0
+        }
+        default {
+            error "unknown mode settings \"$itk_option(-mode)\""
+        }
     }
     if { !$_reset } {
@@ -1617 +1617 @@
             SendCmd "screen bgcolor $rgb"
         }
-        $itk_component(view) configure -background $itk_option(-plotbackground)
+        $itk_component(view) configure -background $itk_option(-plotbackground)
     }
 }
@@ -1675 +1675 @@
 
     itk_component add field_l {
-        label $inner.field_l -text "Field" -font "Arial 9" 
+        label $inner.field_l -text "Field" -font "Arial 9"
     } {
         ignore -font
@@ -1685 +1685 @@
         [itcl::code $this AdjustSetting -field]
 
-    label $inner.colormap_l -text "Colormap" -font "Arial 9" 
+    label $inner.colormap_l -text "Colormap" -font "Arial 9"
     itk_component add colormap {
         Rappture::Combobox $inner.colormap -width 10 -editable no
@@ -1695 +1695 @@
         [itcl::code $this AdjustSetting -colormap]
 
-    label $inner.backingcolor_l -text "Backing Color" -font "Arial 9" 
+    label $inner.backingcolor_l -text "Backing Color" -font "Arial 9"
     itk_component add backingcolor {
         Rappture::Combobox $inner.backingcolor -width 10 -editable no
@@ -1709 +1709 @@
         "red"                "red"              \
         "white"              "white"            \
-        "none"               "none"
+        "none"               "none"
 
     $itk_component(backingcolor) value $_settings(-backingcolor)
     bind $inner.backingcolor <<Value>> \
-        [itcl::code $this AdjustSetting -backingcolor]
-
-    label $inner.background_l -text "Background Color" -font "Arial 9" 
+        [itcl::code $this AdjustSetting -backingcolor]
+
+    label $inner.background_l -text "Background Color" -font "Arial 9"
     itk_component add background {
         Rappture::Combobox $inner.background -width 10 -editable no
@@ -1722 +1722 @@
         "black"              "black"            \
         "white"              "white"            \
-        "grey"               "grey"             
+        "grey"               "grey"
 
     $itk_component(background) value "white"
@@ -1773 +1773 @@
         2,0 $inner.backingcolor_l  -anchor w -pady 2  \
         2,1 $inner.backingcolor    -anchor w -pady 2 -fill x  \
-        3,0 $inner.background_l -anchor w -pady 2 \
-        3,1 $inner.background -anchor w -pady 2  -fill x \
+        3,0 $inner.background_l -anchor w -pady 2 \
+        3,1 $inner.background -anchor w -pady 2  -fill x \
         4,0 $inner.backing -anchor w -pady 2 -cspan 2 \
         5,0 $inner.stretch    -anchor w -pady 2 -cspan 2 \
@@ -1787 +1787 @@
         16,1 $inner.window   -fill x   -pady 2 \
         17,0 $inner.level_l -anchor w -pady 2 \
-        17,1 $inner.level   -fill x   -pady 2 
+        17,1 $inner.level   -fill x   -pady 2
 
     blt::table configure $inner r* c* -resize none
@@ -1813 +1813 @@
         -command [itcl::code $this AdjustSetting -axislabels] \
         -font "Arial 9"
-    label $inner.grid_l -text "Grid" -font "Arial 9" 
+    label $inner.grid_l -text "Grid" -font "Arial 9"
     checkbutton $inner.xgrid \
         -text "X" \
@@ -1835 +1835 @@
         -font "Arial 9"
 
-    label $inner.mode_l -text "Mode" -font "Arial 9" 
+    label $inner.mode_l -text "Mode" -font "Arial 9"
 
     itk_component add axisflymode {
@@ -1844 +1844 @@
         "closest_triad"   "closest" \
         "furthest_triad"  "farthest" \
-        "outer_edges"     "outer"         
+        "outer_edges"     "outer"
     $itk_component(axisflymode) value $_settings(-axisflymode)
     bind $inner.mode <<Value>> [itcl::code $this AdjustSetting -axisflymode]
@@ -1852 +1852 @@
         1,0 $inner.labels  -anchor w -cspan 4 \
         2,0 $inner.minorticks  -anchor w -cspan 4 \
-        4,0 $inner.grid_l  -anchor w \
+        4,0 $inner.grid_l  -anchor w \
         4,1 $inner.xgrid   -anchor w \
         4,2 $inner.ygrid   -anchor w \
         4,3 $inner.zgrid   -anchor w \
         5,0 $inner.mode_l  -anchor w -padx { 2 0 } \
-        5,1 $inner.mode    -fill x -cspan 3 
+        5,1 $inner.mode    -fill x -cspan 3
 
     blt::table configure $inner r* c* -resize none
@@ -1916 +1916 @@
 
 #
-#  camera -- 
+#  camera --
 #
 itcl::body Rappture::VtkImageViewer::camera {option args} {
-    switch -- $option { 
+    switch -- $option {
         "show" {
             puts [array get _view]
@@ -1967 +1967 @@
 
 itcl::body Rappture::VtkImageViewer::GetImage { args } {
-    if { [image width $_image(download)] > 0 && 
+    if { [image width $_image(download)] > 0 &&
          [image height $_image(download)] > 0 } {
         set bytes [$_image(download) data -format "jpeg -quality 100"]
@@ -1980 +1980 @@
         -title "[Rappture::filexfer::label downloadWord] as..."
     set inner [$popup component inner]
-    label $inner.summary -text "" -anchor w 
+    label $inner.summary -text "" -anchor w
     radiobutton $inner.vtk_button -text "VTK data file" \
         -variable [itcl::scope _downloadPopup(format)] \
         -font "Arial 9 " \
-        -value vtk  
+        -value vtk
     Rappture::Tooltip::for $inner.vtk_button "Save as VTK data file."
     radiobutton $inner.image_button -text "Image File" \
         -variable [itcl::scope _downloadPopup(format)] \
         -font "Arial 9 " \
-        -value image 
+        -value image
     Rappture::Tooltip::for $inner.image_button \
         "Save as digital image."
@@ -2010 +2010 @@
         2,0 $inner.image_button -anchor w -cspan 2 -padx { 4 0 } \
         4,1 $inner.cancel -width .9i -fill y \
-        4,0 $inner.ok -padx 2 -width .9i -fill y 
+        4,0 $inner.ok -padx 2 -width .9i -fill y
     blt::table configure $inner r3 -height 4
     blt::table configure $inner r4 -pady 4
@@ -2021 +2021 @@
 # SetObjectStyle --
 #
-#       Set the style of the image/contour object.  This gets calls 
+#       Set the style of the image/contour object.  This gets calls
 #       for each dataset once as it is loaded.  It can overridden by
 #       the user controls.
@@ -2063 +2063 @@
     SendCmd "outline visible $_settings(-outline) $tag"
     SendCmd "image add $tag"
-    SetCurrentColormap $style(-color) 
+    SetCurrentColormap $style(-color)
     set color [$itk_component(backingcolor) value]
     SendCmd "image color [Color2RGB $color] $tag"
@@ -2094 +2094 @@
         #puts stderr "read $size bytes for [image width $_image(legend)]x[image height $_image(legend)] legend>"
         if { [catch {DrawLegend} errs] != 0 } {
-            global errorInfo
-            puts stderr "errs=$errs errorInfo=$errorInfo"
+            global errorInfo
+            puts stderr "errs=$errs errorInfo=$errorInfo"
         }
     }
@@ -2112 +2112 @@
     set font "Arial 8"
     set lineht [font metrics $font -linespace]
-    
+
     if { [string match "component*" $fname] } {
-        set title ""
+        set title ""
     } else {
-        if { [info exists _fields($fname)] } {
-            foreach { title units } $_fields($fname) break
-            if { $units != "" } {
-                set title [format "%s (%s)" $title $units]
-            }
-        } else {
-            set title $fname
-        }
+        if { [info exists _fields($fname)] } {
+            foreach { title units } $_fields($fname) break
+            if { $units != "" } {
+                set title [format "%s (%s)" $title $units]
+            }
+        } else {
+            set title $fname
+        }
     }
     set x [expr $w - 2]
     if { !$_settings(-legendvisible) } {
-        $c delete legend
-        return
-    } 
+        $c delete legend
+        return
+    }
     if { [$c find withtag "legend"] == "" } {
-        set y 2 
-        # If there's a legend title, create a text item for the title.
+        set y 2
+        # If there's a legend title, create a text item for the title.
         $c create text $x $y \
             -anchor ne \
@@ -2140 +2140 @@
             incr y $lineht
         }
-        $c create text $x $y \
+        $c create text $x $y \
             -anchor ne \
             -fill $itk_option(-plotforeground) -tags "vmax legend" \
             -font $font
         incr y $lineht
-        $c create image $x $y \
-            -anchor ne \
-            -image $_image(legend) -tags "colormap legend"
-        $c create rectangle $x $y 1 1 \
-            -fill "" -outline "" -tags "sensor legend"
-        $c create text $x [expr {$h-2}] \
-            -anchor se \
-            -fill $itk_option(-plotforeground) -tags "vmin legend" \
-            -font $font
-        $c bind sensor <Enter> [itcl::code $this EnterLegend %x %y]
-        $c bind sensor <Leave> [itcl::code $this LeaveLegend]
-        $c bind sensor <Motion> [itcl::code $this MotionLegend %x %y]
+        $c create image $x $y \
+            -anchor ne \
+            -image $_image(legend) -tags "colormap legend"
+        $c create rectangle $x $y 1 1 \
+            -fill "" -outline "" -tags "sensor legend"
+        $c create text $x [expr {$h-2}] \
+            -anchor se \
+            -fill $itk_option(-plotforeground) -tags "vmin legend" \
+            -font $font
+        $c bind sensor <Enter> [itcl::code $this EnterLegend %x %y]
+        $c bind sensor <Leave> [itcl::code $this LeaveLegend]
+        $c bind sensor <Motion> [itcl::code $this MotionLegend %x %y]
     }
 
@@ -2170 +2170 @@
     if { [info exists _limits($_curFldName)] } {
         foreach { vmin vmax } $_limits($_curFldName) break
-        $c itemconfigure vmin -text [format %g $vmin]
-        $c itemconfigure vmax -text [format %g $vmax]
+        $c itemconfigure vmin -text [format %g $vmin]
+        $c itemconfigure vmax -text [format %g $vmax]
     }
     set y 2
@@ -2177 +2177 @@
     if { $title != "" } {
         $c itemconfigure title -text $title
-        $c coords title $x $y
-        incr y $lineht
+        $c coords title $x $y
+        incr y $lineht
     }
     $c coords vmax $x $y
@@ -2226 +2226 @@
     set font "Arial 8"
     set lineht [font metrics $font -linespace]
-    
+
     set ih [image height $_image(legend)]
     # Subtract off the offset of the color ramp from the top of the canvas
@@ -2232 +2232 @@
 
     if { [string match "component*" $fname] } {
-        set title ""
+        set title ""
     } else {
-        if { [info exists _fields($fname)] } {
-            foreach { title units } $_fields($fname) break
-            if { $units != "" } {
-                set title [format "%s (%s)" $title $units]
-            }
-        } else {
-            set title $fname
-        }
+        if { [info exists _fields($fname)] } {
+            foreach { title units } $_fields($fname) break
+            if { $units != "" } {
+                set title [format "%s (%s)" $title $units]
+            }
+        } else {
+            set title $fname
+        }
     }
     # If there's a legend title, increase the offset by the line height.
@@ -2257 +2257 @@
     }
     set color [eval format "\#%02x%02x%02x" $pixel]
-    $_image(swatch) put black  -to 0 0 23 23 
-    $_image(swatch) put $color -to 1 1 22 22 
+    $_image(swatch) put black  -to 0 0 23 23
+    $_image(swatch) put $color -to 1 1 22 22
 
     # Compute the value of the point
@@ -2268 +2268 @@
         set value 0.0
     }
-    set tipx [expr $x + 15] 
+    set tipx [expr $x + 15]
     set tipy [expr $y - 5]
     .rappturetooltip configure -icon $_image(swatch)
@@ -2276 +2276 @@
         Rappture::Tooltip::text $c [format "$title %g" $value]
     }
-    Rappture::Tooltip::tooltip show $c +$tipx,+$tipy    
+    Rappture::Tooltip::tooltip show $c +$tipx,+$tipy
 }
 
@@ -2291 +2291 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::VtkImageViewer::Combo {option} {
-    set c $itk_component(view) 
+    set c $itk_component(view)
     switch -- $option {
         post {
@@ -2304 +2304 @@
         }
         deactivate {
-            $c itemconfigure title -fill $itk_option(-plotforeground) 
+            $c itemconfigure title -fill $itk_option(-plotforeground)
         }
         invoke {
@@ -2316 +2316 @@
 }
 
-itcl::body Rappture::VtkImageViewer::SetOrientation { side } { 
+itcl::body Rappture::VtkImageViewer::SetOrientation { side } {
     array set positions {
         front  "0.707107 0.707107 0 0"
@@ -2327 +2327 @@
     foreach name { -qw -qx -qy -qz } value $positions($side) {
         set _view($name) $value
-    } 
+    }
     set q [ViewToQuaternion]
     $_arcball quaternion $q

branches/1.4/gui/scripts/vtkmeshviewer.tcl

@@ -1 @@
-# -*- mode: tcl; indent-tabs-mode: nil -*- 
+# -*- mode: tcl; indent-tabs-mode: nil -*-
 # ----------------------------------------------------------------------
 #  COMPONENT: vtkmeshviewer - Vtk mesh viewer
@@ -58 +58 @@
     public method isconnected {}
     public method limits { dataobj }
-    public method parameters {title args} { 
-        # do nothing 
+    public method parameters {title args} {
+        # do nothing
     }
     public method scale {args}
@@ -67 +67 @@
     private method BuildAxisTab {}
     private method BuildCameraTab {}
-    private method BuildDownloadPopup { widget command } 
+    private method BuildDownloadPopup { widget command }
     private method BuildPolydataTab {}
     private method Connect {}
@@ -74 +74 @@
     private method DoResize {}
     private method DoRotate {}
-    private method EventuallyResize { w h } 
-    private method EventuallyRotate { q } 
-    private method EventuallySetPolydataOpacity {} 
-    private method GetImage { args } 
-    private method GetVtkData { args } 
+    private method EventuallyResize { w h }
+    private method EventuallyRotate { q }
+    private method EventuallySetPolydataOpacity {}
+    private method GetImage { args }
+    private method GetVtkData { args }
     private method InitSettings { args  }
-    private method IsValidObject { dataobj } 
+    private method IsValidObject { dataobj }
     private method Pan {option x y}
     private method PanCamera {}
     private method Pick {x y}
-    private method QuaternionToView { q } { 
+    private method QuaternionToView { q } {
         foreach { _view(-qw) _view(-qx) _view(-qy) _view(-qz) } $q break
     }
@@ -91 +91 @@
     private method ReceiveImage { args }
     private method Rotate {option x y}
-    private method SetObjectStyle { dataobj } 
+    private method SetObjectStyle { dataobj }
     private method SetOrientation { side }
     private method SetPolydataOpacity {}
-    private method ViewToQuaternion {} { 
+    private method ViewToQuaternion {} {
         return [list $_view(-qw) $_view(-qx) $_view(-qy) $_view(-qz)]
     }
@@ -100 +100 @@
 
     private variable _arcball ""
-    private variable _dlist "";         # list of data objects
+    private variable _dlist "";         # list of data objects
     private variable _obj2datasets
-    private variable _obj2ovride;       # maps dataobj => style override
-    private variable _datasets;         # contains all the dataobj-component 
-                                        # datasets in the server
-    private variable _dataset2style;    # maps dataobj-component to transfunc
-    private variable _style2datasets;   # maps tf back to list of 
-                                        # dataobj-components using the tf.
+    private variable _obj2ovride;       # maps dataobj => style override
+    private variable _datasets;         # contains all the dataobj-component
+                                        # datasets in the server
+    private variable _dataset2style;    # maps dataobj-component to transfunc
+    private variable _style2datasets;   # maps tf back to list of
+                                        # dataobj-components using the tf.
     private variable _click;            # info used for rotate operations
     private variable _limits;           # autoscale min/max for all axes
@@ -200 +200 @@
     array set _widget {
         -polydataopacity        100
-    }        
+    }
     itk_component add view {
         canvas $itk_component(plotarea).view \
@@ -211 +211 @@
     itk_component add fieldmenu {
         menu $itk_component(plotarea).menu -bg black -fg white -relief flat \
-            -tearoff no 
+            -tearoff no
     } {
         usual
@@ -232 +232 @@
 
     set _map(id) [$c create image 0 0 -anchor nw -image $_image(plot)]
-    set _map(cwidth) -1 
-    set _map(cheight) -1 
+    set _map(cwidth) -1
+    set _map(cheight) -1
     set _map(zoom) 1.0
     set _map(original) ""
@@ -279 +279 @@
     BuildCameraTab
 
-    # Hack around the Tk panewindow.  The problem is that the requested 
+    # Hack around the Tk panewindow.  The problem is that the requested
     # size of the 3d view isn't set until an image is retrieved from
     # the server.  So the panewindow uses the tiny size.
@@ -285 +285 @@
     pack forget $itk_component(view)
     blt::table $itk_component(plotarea) \
-        0,0 $itk_component(view) -fill both -reqwidth $w 
+        0,0 $itk_component(view) -fill both -reqwidth $w
     blt::table configure $itk_component(plotarea) c1 -resize none
 
@@ -372 +372 @@
 
 itcl::body Rappture::VtkMeshViewer::DoRotate {} {
-    SendCmd "camera orient [ViewToQuaternion]" 
+    SendCmd "camera orient [ViewToQuaternion]"
     set _rotatePending 0
 }
@@ -497 +497 @@
                     continue
                 }
-                if {[info exists _obj2ovride($dataobj-raise)] && 
+                if {[info exists _obj2ovride($dataobj-raise)] &&
                     $_obj2ovride($dataobj-raise)} {
                     set dlist [linsert $dlist 0 $dataobj]
@@ -525 +525 @@
             }
             return $dlist
-        }           
+        }
         -image {
             if {[llength $args] != 2} {
@@ -814 +814 @@
     # Turn on buffering of commands to the server.  We don't want to
     # be preempted by a server disconnect/reconnect (which automatically
-    # generates a new call to Rebuild).   
+    # generates a new call to Rebuild).
     StartBufferingCommands
 
@@ -897 +897 @@
         InitSettings -polydataedges -polydatalighting -polydataopacity \
             -polydatavisible -polydatawireframe
- 
+
         #SendCmd "axis lformat all %g"
 
@@ -933 +933 @@
 itcl::body Rappture::VtkMeshViewer::CurrentDatasets {args} {
     set flag [lindex $args 0]
-    switch -- $flag { 
+    switch -- $flag {
         "-all" {
             if { [llength $args] > 1 } {
@@ -952 +952 @@
                 set dlist [get -visible]
             }
-        }           
+        }
         default {
             set dlist $args
@@ -1068 +1068 @@
     foreach tag [CurrentDatasets -visible] {
         SendCmd "dataset getscalar pixel $x $y $tag"
-    } 
+    }
 }
 
@@ -1245 +1245 @@
         set f [open "$tmpfile" "w"]
         fconfigure $f -translation binary -encoding binary
-        puts $f $data 
+        puts $f $data
         close $f
         set reader [vtkDataSetReader $tag-xvtkDataSetReader]
@@ -1293 +1293 @@
         -variable [itcl::scope _settings(-polydatavisible)] \
         -command [itcl::code $this AdjustSetting -polydatavisible] \
-        -font "Arial 9" -anchor w 
+        -font "Arial 9" -anchor w
 
     checkbutton $inner.outline \
@@ -1299 +1299 @@
         -variable [itcl::scope _settings(-outline)] \
         -command [itcl::code $this AdjustSetting -outline] \
-        -font "Arial 9" -anchor w 
+        -font "Arial 9" -anchor w
 
     checkbutton $inner.wireframe \
@@ -1305 +1305 @@
         -variable [itcl::scope _settings(-polydatawireframe)] \
         -command [itcl::code $this AdjustSetting -polydatawireframe] \
-        -font "Arial 9" -anchor w 
+        -font "Arial 9" -anchor w
 
     checkbutton $inner.lighting \
@@ -1320 +1320 @@
 
     itk_component add field_l {
-        label $inner.field_l -text "Field" -font "Arial 9" 
+        label $inner.field_l -text "Field" -font "Arial 9"
     } {
         ignore -font
@@ -1330 +1330 @@
         [itcl::code $this AdjustSetting -field]
 
-    label $inner.opacity_l -text "Opacity" -font "Arial 9" -anchor w 
+    label $inner.opacity_l -text "Opacity" -font "Arial 9" -anchor w
     ::scale $inner.opacity -from 0 -to 100 -orient horizontal \
         -variable [itcl::scope _widget(-polydataopacity)] \
@@ -1345 +1345 @@
         4,0 $inner.edges     -cspan 2  -anchor w -pady 2 \
         5,0 $inner.opacity_l -anchor w -pady 2 \
-        5,1 $inner.opacity   -fill x   -pady 2 
+        5,1 $inner.opacity   -fill x   -pady 2
 
     blt::table configure $inner r* c* -resize none
@@ -1372 +1372 @@
         -command [itcl::code $this AdjustSetting -axislabels] \
         -font "Arial 9"
-    label $inner.grid_l -text "Grid" -font "Arial 9" 
+    label $inner.grid_l -text "Grid" -font "Arial 9"
     checkbutton $inner.xgrid \
         -text "X" \
@@ -1394 +1394 @@
         -font "Arial 9"
 
-    label $inner.mode_l -text "Mode" -font "Arial 9" 
+    label $inner.mode_l -text "Mode" -font "Arial 9"
 
     itk_component add axismode {
@@ -1403 +1403 @@
         "closest_triad"   "closest" \
         "furthest_triad"  "farthest" \
-        "outer_edges"     "outer"         
+        "outer_edges"     "outer"
     $itk_component(axismode) value "static"
     bind $inner.mode <<Value>> [itcl::code $this AdjustSetting -axismode]
@@ -1475 +1475 @@
 
 #
-#  camera -- 
+#  camera --
 #
 itcl::body Rappture::VtkMeshViewer::camera {option args} {
-    switch -- $option { 
+    switch -- $option {
         "show" {
             puts [array get _view]
@@ -1523 +1523 @@
 
 itcl::body Rappture::VtkMeshViewer::GetImage { args } {
-    if { [image width $_image(download)] > 0 && 
+    if { [image width $_image(download)] > 0 &&
          [image height $_image(download)] > 0 } {
         set bytes [$_image(download) data -format "jpeg -quality 100"]
@@ -1536 +1536 @@
         -title "[Rappture::filexfer::label downloadWord] as..."
     set inner [$popup component inner]
-    label $inner.summary -text "" -anchor w 
+    label $inner.summary -text "" -anchor w
     radiobutton $inner.vtk_button -text "VTK data file" \
         -variable [itcl::scope _downloadPopup(format)] \
         -font "Helvetica 9 " \
-        -value vtk  
+        -value vtk
     Rappture::Tooltip::for $inner.vtk_button "Save as VTK data file."
     radiobutton $inner.image_button -text "Image File" \
         -variable [itcl::scope _downloadPopup(format)] \
-        -value image 
+        -value image
     Rappture::Tooltip::for $inner.image_button \
         "Save as digital image."
@@ -1565 +1565 @@
         2,0 $inner.image_button -anchor w -cspan 2 -padx { 4 0 } \
         4,1 $inner.cancel -width .9i -fill y \
-        4,0 $inner.ok -padx 2 -width .9i -fill y 
+        4,0 $inner.ok -padx 2 -width .9i -fill y
     blt::table configure $inner r3 -height 4
     blt::table configure $inner r4 -pady 4
@@ -1634 +1634 @@
 }
 
-itcl::body Rappture::VtkMeshViewer::SetOrientation { side } { 
+itcl::body Rappture::VtkMeshViewer::SetOrientation { side } {
     array set positions {
         front "1 0 0 0"
@@ -1645 +1645 @@
     foreach name { -qw -qx -qy -qz } value $positions($side) {
         set _view($name) $value
-    } 
+    }
     set q [ViewToQuaternion]
     $_arcball quaternion $q

branches/1.4/gui/scripts/vtkstreamlinesviewer.tcl

@@ -1 @@
-# -*- mode: tcl; indent-tabs-mode: nil -*- 
+# -*- mode: tcl; indent-tabs-mode: nil -*-
 # ----------------------------------------------------------------------
 #  COMPONENT: vtkstreamlinesviewer - Vtk streamlines object viewer
@@ -57 +57 @@
     public method get {args}
     public method isconnected {}
-    public method parameters {title args} { 
-        # do nothing 
+    public method parameters {title args} {
+        # do nothing
     }
     public method scale {args}
@@ -68 +68 @@
     private method BuildColormap { name colors }
     private method BuildCutplaneTab {}
-    private method BuildDownloadPopup { widget command } 
+    private method BuildDownloadPopup { widget command }
     private method BuildStreamsTab {}
     private method BuildVolumeTab {}
@@ -79 +79 @@
     private method DoReseed {}
     private method DoRotate {}
-    private method EnterLegend { x y } 
-    private method EventuallyResize { w h } 
-    private method EventuallyReseed { numPoints } 
-    private method EventuallyRotate { q } 
-    private method EventuallySetCutplane { axis args } 
-    private method GetImage { args } 
-    private method GetVtkData { args } 
+    private method EnterLegend { x y }
+    private method EventuallyResize { w h }
+    private method EventuallyReseed { numPoints }
+    private method EventuallyRotate { q }
+    private method EventuallySetCutplane { axis args }
+    private method GetImage { args }
+    private method GetVtkData { args }
     private method InitSettings { args  }
-    private method IsValidObject { dataobj } 
+    private method IsValidObject { dataobj }
     private method LeaveLegend {}
-    private method MotionLegend { x y } 
+    private method MotionLegend { x y }
     private method Pan {option x y}
     private method PanCamera {}
     private method Pick {x y}
-    private method QuaternionToView { q } { 
+    private method QuaternionToView { q } {
         foreach { _view(-qw) _view(-qx) _view(-qy) _view(-qz) } $q break
     }
@@ -105 +105 @@
     private method ChangeColormap { dataobj comp color }
     private method SetLegendTip { x y }
-    private method SetObjectStyle { dataobj comp } 
-    private method Slice {option args} 
+    private method SetObjectStyle { dataobj comp }
+    private method Slice {option args}
     private method SetOrientation { side }
-    private method ViewToQuaternion {} { 
+    private method ViewToQuaternion {} {
         return [list $_view(-qw) $_view(-qx) $_view(-qy) $_view(-qz)]
     }
@@ -118 +118 @@
     private variable _obj2datasets
     private variable _obj2ovride   ;    # maps dataobj => style override
-    private variable _datasets     ;    # contains all the dataobj-component 
+    private variable _datasets     ;    # contains all the dataobj-component
                                    ;    # datasets in the server
     private variable _colormaps    ;    # contains all the colormaps
@@ -147 +147 @@
     private variable _cutplanePending 0
     private variable _legendPending 0
-    private variable _vectorFields 
-    private variable _scalarFields 
-    private variable _fields 
+    private variable _vectorFields
+    private variable _scalarFields
+    private variable _fields
     private variable _curFldName ""
     private variable _curFldLabel ""
@@ -271 +271 @@
     itk_component add fieldmenu {
         menu $itk_component(plotarea).menu -bg black -fg white -relief flat \
-            -tearoff no 
+            -tearoff no
     } {
         usual
@@ -291 +291 @@
 
     set _map(id) [$c create image 0 0 -anchor nw -image $_image(plot)]
-    set _map(cwidth) -1 
-    set _map(cheight) -1 
+    set _map(cwidth) -1
+    set _map(cheight) -1
     set _map(zoom) 1.0
     set _map(original) ""
@@ -338 +338 @@
             -offimage [Rappture::icon volume-off] \
             -variable [itcl::scope _settings(-volumevisible)] \
-            -command [itcl::code $this AdjustSetting -volumevisible] 
+            -command [itcl::code $this AdjustSetting -volumevisible]
     }
     $itk_component(volume) select
@@ -362 +362 @@
             -offimage [Rappture::icon cutbutton] \
             -variable [itcl::scope _settings(-cutplanevisible)] \
-            -command [itcl::code $this AdjustSetting -cutplanevisible] 
+            -command [itcl::code $this AdjustSetting -cutplanevisible]
     }
     Rappture::Tooltip::for $itk_component(cutplane) \
@@ -382 +382 @@
     set _image(legend) [image create photo]
     itk_component add legend {
-        canvas $itk_component(plotarea).legend -width 50 -highlightthickness 0 
+        canvas $itk_component(plotarea).legend -width 50 -highlightthickness 0
     } {
         usual
@@ -389 +389 @@
     }
 
-    # Hack around the Tk panewindow.  The problem is that the requested 
+    # Hack around the Tk panewindow.  The problem is that the requested
     # size of the 3d view isn't set until an image is retrieved from
     # the server.  So the panewindow uses the tiny size.
@@ -395 +395 @@
     pack forget $itk_component(view)
     blt::table $itk_component(plotarea) \
-        0,0 $itk_component(view) -fill both -reqwidth $w 
+        0,0 $itk_component(view) -fill both -reqwidth $w
     blt::table configure $itk_component(plotarea) c1 -resize none
 
@@ -480 +480 @@
 
 itcl::body Rappture::VtkStreamlinesViewer::DoRotate {} {
-    SendCmd "camera orient [ViewToQuaternion]" 
+    SendCmd "camera orient [ViewToQuaternion]"
     set _rotatePending 0
 }
@@ -517 +517 @@
     if { !$_rotatePending } {
         set _rotatePending 1
-        global rotate_delay 
+        global rotate_delay
         $_dispatcher event -after $rotate_delay !rotate
     }
@@ -621 +621 @@
                     continue
                 }
-                if {[info exists _obj2ovride($dataobj-raise)] && 
+                if {[info exists _obj2ovride($dataobj-raise)] &&
                     $_obj2ovride($dataobj-raise)} {
                     set dlist [linsert $dlist 0 $dataobj]
@@ -649 +649 @@
             }
             return $dlist
-        }           
+        }
         -image {
             if {[llength $args] != 2} {
@@ -791 +791 @@
             set info {}
             set user "???"
-            if { [info exists env(USER)] } {
+            if { [info exists env(USER)] } {
                 set user $env(USER)
-            }
+            }
             set session "???"
-            if { [info exists env(SESSION)] } {
+            if { [info exists env(SESSION)] } {
                 set session $env(SESSION)
-            }
+            }
             lappend info "version" "$Rappture::version"
             lappend info "build" "$Rappture::build"
@@ -851 +851 @@
     $_dispatcher cancel !legend
     # disconnected -- no more data sitting on server
-    array unset _datasets 
-    array unset _data 
-    array unset _colormaps 
-    array unset _seeds 
-    array unset _dataset2style 
-    array unset _obj2datasets 
+    array unset _datasets
+    array unset _data
+    array unset _colormaps
+    array unset _seeds
+    array unset _dataset2style
+    array unset _obj2datasets
 }
 
@@ -884 +884 @@
         set time [clock seconds]
         set date [clock format $time]
-        #puts stderr "$date: received image [image width $_image(plot)]x[image height $_image(plot)] image>"        
+        #puts stderr "$date: received image [image width $_image(plot)]x[image height $_image(plot)] image>"
         if { $_start > 0 } {
             set finish [clock clicks -milliseconds]
@@ -964 +964 @@
     set _first ""
     if { $_reset } {
-        set _width $w
-        set _height $h
-        $_arcball resize $w $h
-        DoResize
-        InitSettings -xgrid -ygrid -zgrid -axismode \
-            -axesvisible -axislabelsvisible -axisminorticks
+        set _width $w
+        set _height $h
+        $_arcball resize $w $h
+        DoResize
+        InitSettings -xgrid -ygrid -zgrid -axismode \
+            -axesvisible -axislabelsvisible -axisminorticks
         # This "imgflush" is to force an image returned before vtkvis starts
         # reading a (big) dataset.  This will display an empty plot with axes
@@ -988 +988 @@
                 set bytes [$dataobj vtkdata $comp]
                 set length [string length $bytes]
-                if 0 { 
+                if 0 {
                     set f [open /tmp/vtkstreamlines.vtk "w"]
                     fconfigure $f -translation binary -encoding binary
                     puts -nonewline $f $bytes
                     close $f
-                }
+                }
                 if { $_reportClientInfo }  {
                     set info {}
@@ -1032 +1032 @@
             }
         }
-        $itk_component(field) choices delete 0 end
-        $itk_component(fieldmenu) delete 0 end
-        array unset _fields
+        $itk_component(field) choices delete 0 end
+        $itk_component(fieldmenu) delete 0 end
+        array unset _fields
         set _curFldName ""
         foreach cname [$_first components] {
@@ -1068 +1068 @@
             -volumevisible -volumeedges -volumelighting -volumeopacity \
             -volumewireframe \
-            -cutplanevisible \
-            -cutplanexposition -cutplaneyposition -cutplanezposition \
-            -cutplanexvisible -cutplaneyvisible -cutplanezvisible
-
-        # Reset the camera and other view parameters
-        $_arcball quaternion [ViewToQuaternion]
-        if {$_view(-ortho)} {
-            SendCmd "camera mode ortho"
-        } else {
-            SendCmd "camera mode persp"
-        }
-        DoRotate
-        PanCamera
+            -cutplanevisible \
+            -cutplanexposition -cutplaneyposition -cutplanezposition \
+            -cutplanexvisible -cutplaneyvisible -cutplanezvisible
+
+        # Reset the camera and other view parameters
+        $_arcball quaternion [ViewToQuaternion]
+        if {$_view(-ortho)} {
+            SendCmd "camera mode ortho"
+        } else {
+            SendCmd "camera mode persp"
+        }
+        DoRotate
+        PanCamera
         Zoom reset
         SendCmd "camera reset"
@@ -1101 +1101 @@
 itcl::body Rappture::VtkStreamlinesViewer::CurrentDatasets {args} {
     set flag [lindex $args 0]
-    switch -- $flag { 
+    switch -- $flag {
         "-all" {
             if { [llength $args] > 1 } {
@@ -1120 +1120 @@
                 set dlist [get -visible]
             }
-        }           
+        }
         default {
             set dlist $args
@@ -1239 +1239 @@
     foreach tag [CurrentDatasets -visible] {
         SendCmdNoWait "dataset getscalar pixel $x $y $tag"
-    } 
+    }
 }
 
@@ -1666 +1666 @@
         2,0 $inner.edges     -anchor w -pady 2 -cspan 3 \
         3,0 $inner.opacity_l -anchor w -pady 2 \
-        3,1 $inner.opacity   -fill x   -pady 2 
+        3,1 $inner.opacity   -fill x   -pady 2
 
     blt::table configure $inner r* c* -resize none
@@ -1687 +1687 @@
         -command [itcl::code $this AdjustSetting -streamlinesvisible] \
         -font "Arial 9"
-    
+
     checkbutton $inner.lighting \
         -text "Enable Lighting" \
@@ -1700 +1700 @@
         -font "Arial 9"
 
-    label $inner.mode_l -text "Mode" -font "Arial 9" 
+    label $inner.mode_l -text "Mode" -font "Arial 9"
     itk_component add streammode {
         Rappture::Combobox $inner.mode -width 10 -editable no
@@ -1707 +1707 @@
         "lines"    "lines" \
         "ribbons"   "ribbons" \
-        "tubes"     "tubes" 
+        "tubes"     "tubes"
     $itk_component(streammode) value $_settings(-streamlinesmode)
     bind $inner.mode <<Value>> [itcl::code $this AdjustSetting -streamlinesmode]
@@ -1732 +1732 @@
         -command [itcl::code $this AdjustSetting -streamlinesscale]
 
-    label $inner.field_l -text "Color by" -font "Arial 9" 
+    label $inner.field_l -text "Color by" -font "Arial 9"
     itk_component add field {
         Rappture::Combobox $inner.field -width 10 -editable no
@@ -1739 +1739 @@
         [itcl::code $this AdjustSetting -field]
 
-    label $inner.colormap_l -text "Colormap" -font "Arial 9" 
+    label $inner.colormap_l -text "Colormap" -font "Arial 9"
     itk_component add colormap {
         Rappture::Combobox $inner.colormap -width 10 -editable no
@@ -1788 +1788 @@
         -command [itcl::code $this AdjustSetting -axislabelsvisible] \
         -font "Arial 9"
-    label $inner.grid_l -text "Grid" -font "Arial 9" 
+    label $inner.grid_l -text "Grid" -font "Arial 9"
     checkbutton $inner.xgrid \
         -text "X" \
@@ -1810 +1810 @@
         -font "Arial 9"
 
-    label $inner.mode_l -text "Mode" -font "Arial 9" 
+    label $inner.mode_l -text "Mode" -font "Arial 9"
 
     itk_component add axismode {
@@ -1819 +1819 @@
         "closest_triad"   "closest" \
         "furthest_triad"  "farthest" \
-        "outer_edges"     "outer"         
+        "outer_edges"     "outer"
     $itk_component(axismode) value $_settings(-axismode)
     bind $inner.mode <<Value>> [itcl::code $this AdjustSetting -axismode]
@@ -1893 +1893 @@
 
     set fg [option get $itk_component(hull) font Font]
-    
+
     set inner [$itk_component(main) insert end \
         -title "Cutplane Settings" \
-        -icon [Rappture::icon cutbutton]] 
+        -icon [Rappture::icon cutbutton]]
 
     $inner configure -borderwidth 4
@@ -1950 +1950 @@
             -command [itcl::code $this EventuallySetCutplane x] \
             -variable [itcl::scope _settings(-cutplanexposition)] \
-            -foreground red3 -font "Arial 9 bold"
+            -foreground red3 -font "Arial 9 bold"
     } {
         usual
@@ -1979 +1979 @@
             -command [itcl::code $this EventuallySetCutplane y] \
             -variable [itcl::scope _settings(-cutplaneyposition)] \
-            -foreground green3 -font "Arial 9 bold"
+            -foreground green3 -font "Arial 9 bold"
     } {
         usual
@@ -2008 +2008 @@
             -command [itcl::code $this EventuallySetCutplane z] \
             -variable [itcl::scope _settings(-cutplanezposition)] \
-            -foreground blue3 -font "Arial 9 bold"
+            -foreground blue3 -font "Arial 9 bold"
     } {
         usual
@@ -2024 +2024 @@
         3,0 $inner.opacity_l            -anchor w -pady 2 -cspan 1 \
         3,1 $inner.opacity              -fill x   -pady 2 -cspan 3 \
-        4,0 $itk_component(xCutButton)  -anchor w -padx 2 -pady 2 \
+        4,0 $itk_component(xCutButton)  -anchor w -padx 2 -pady 2 \
         5,0 $itk_component(yCutButton)  -anchor w -padx 2 -pady 2 \
         6,0 $itk_component(zCutButton)  -anchor w -padx 2 -pady 2 \
@@ -2036 +2036 @@
 
 #
-#  camera -- 
+#  camera --
 #
 itcl::body Rappture::VtkStreamlinesViewer::camera {option args} {
-    switch -- $option { 
+    switch -- $option {
         "show" {
             puts [array get _view]
@@ -2087 +2087 @@
 
 itcl::body Rappture::VtkStreamlinesViewer::GetImage { args } {
-    if { [image width $_image(download)] > 0 && 
+    if { [image width $_image(download)] > 0 &&
          [image height $_image(download)] > 0 } {
         set bytes [$_image(download) data -format "jpeg -quality 100"]
@@ -2100 +2100 @@
         -title "[Rappture::filexfer::label downloadWord] as..."
     set inner [$popup component inner]
-    label $inner.summary -text "" -anchor w 
+    label $inner.summary -text "" -anchor w
     radiobutton $inner.vtk_button -text "VTK data file" \
         -variable [itcl::scope _downloadPopup(format)] \
         -font "Helvetica 9 " \
-        -value vtk  
+        -value vtk
     Rappture::Tooltip::for $inner.vtk_button "Save as VTK data file."
     radiobutton $inner.image_button -text "Image File" \
         -variable [itcl::scope _downloadPopup(format)] \
-        -value image 
+        -value image
     Rappture::Tooltip::for $inner.image_button \
         "Save as digital image."
@@ -2129 +2129 @@
         2,0 $inner.image_button -anchor w -cspan 2 -padx { 4 0 } \
         4,1 $inner.cancel -width .9i -fill y \
-        4,0 $inner.ok -padx 2 -width .9i -fill y 
+        4,0 $inner.ok -padx 2 -width .9i -fill y
     blt::table configure $inner r3 -height 4
     blt::table configure $inner r4 -pady 4
@@ -2196 +2196 @@
     set _legendPending 0
     set _title $title
-    regsub {\(mag\)} $title "" _title 
+    regsub {\(mag\)} $title "" _title
     if { [IsConnected] } {
         set bytes [ReceiveBytes $size]
@@ -2223 +2223 @@
     set font "Arial 8"
     set lineht [font metrics $font -linespace]
-    
+
     if { [info exists _fields($fname)] } {
         foreach { title units } $_fields($fname) break
@@ -2235 +2235 @@
         set x [expr $w - 2]
         if { [$c find withtag "legend"] == "" } {
-            set y 2 
+            set y 2
             $c create text $x $y \
                 -anchor ne \
@@ -2310 +2310 @@
     set font "Arial 8"
     set lineht [font metrics $font -linespace]
-    
+
     set imgHeight [image height $_image(legend)]
     set coords [$c coords colormap]
@@ -2333 +2333 @@
     }
     set color [eval format "\#%02x%02x%02x" $pixel]
-    $_image(swatch) put black  -to 0 0 23 23 
-    $_image(swatch) put $color -to 1 1 22 22 
+    $_image(swatch) put black  -to 0 0 23 23
+    $_image(swatch) put $color -to 1 1 22 22
     .rappturetooltip configure -icon $_image(swatch)
 
@@ -2345 +2345 @@
         set value 0.0
     }
-    set tipx [expr $x + 15] 
+    set tipx [expr $x + 15]
     set tipy [expr $y - 5]
     Rappture::Tooltip::text $c "$title $value"
-    Rappture::Tooltip::tooltip show $c +$tipx,+$tipy    
+    Rappture::Tooltip::tooltip show $c +$tipx,+$tipy
 }
 
@@ -2393 +2393 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::VtkStreamlinesViewer::Combo {option} {
-    set c $itk_component(view) 
+    set c $itk_component(view)
     switch -- $option {
         post {
@@ -2406 +2406 @@
         }
         deactivate {
-            $c itemconfigure title -fill white 
+            $c itemconfigure title -fill white
         }
         invoke {
@@ -2418 +2418 @@
 }
 
-itcl::body Rappture::VtkStreamlinesViewer::SetOrientation { side } { 
+itcl::body Rappture::VtkStreamlinesViewer::SetOrientation { side } {
     array set positions {
         front "1 0 0 0"
@@ -2429 +2429 @@
     foreach name { -qw -qx -qy -qz } value $positions($side) {
         set _view($name) $value
-    } 
+    }
     set q [ViewToQuaternion]
     $_arcball quaternion $q
-    SendCmd "camera orient $q" 
+    SendCmd "camera orient $q"
     SendCmd "camera reset"
     set _view(-xpan) 0

branches/1.4/gui/scripts/vtksurfaceviewer.tcl

@@ -1 @@
-# -*- mode: tcl; indent-tabs-mode: nil -*- 
+# -*- mode: tcl; indent-tabs-mode: nil -*-
 # ----------------------------------------------------------------------
 #  COMPONENT: vtksurfaceviewer - Vtk 3D boundary surface viewer
@@ -57 +57 @@
     public method get {args}
     public method isconnected {}
-    public method parameters {title args} { 
-        # do nothing 
+    public method parameters {title args} {
+        # do nothing
     }
     public method scale {args}
@@ -67 +67 @@
     private method BuildCameraTab {}
     private method BuildColormap { name }
-    private method BuildDownloadPopup { widget command } 
+    private method BuildDownloadPopup { widget command }
     private method BuildSurfaceTab {}
     private method Combo { option }
@@ -76 +76 @@
     private method DoRotate {}
     private method DrawLegend {}
-    private method EnterLegend { x y } 
-    private method EventuallyRequestLegend {} 
-    private method EventuallyResize { w h } 
-    private method EventuallyRotate { q } 
-    private method GetImage { args } 
-    private method GetVtkData { args } 
+    private method EnterLegend { x y }
+    private method EventuallyRequestLegend {}
+    private method EventuallyResize { w h }
+    private method EventuallyRotate { q }
+    private method GetImage { args }
+    private method GetVtkData { args }
     private method InitSettings { args  }
-    private method IsValidObject { dataobj } 
+    private method IsValidObject { dataobj }
     private method LeaveLegend {}
-    private method MotionLegend { x y } 
+    private method MotionLegend { x y }
     private method Pan {option x y}
     private method PanCamera {}
     private method Pick {x y}
-    private method QuaternionToView { q } { 
+    private method QuaternionToView { q } {
         foreach { _view(-qw) _view(-qx) _view(-qy) _view(-qz) } $q break
     }
@@ -103 +103 @@
     private method SetOrientation { side }
     private method UpdateContourList {}
-    private method ViewToQuaternion {} { 
+    private method ViewToQuaternion {} {
         return [list $_view(-qw) $_view(-qx) $_view(-qy) $_view(-qz)]
     }
@@ -113 +113 @@
     private variable _obj2datasets
     private variable _obj2ovride   ;    # maps dataobj => style override
-    private variable _datasets     ;    # contains all the dataobj-component 
+    private variable _datasets     ;    # contains all the dataobj-component
                                    ;    # datasets in the server
     private variable _colormaps    ;    # contains all the colormaps
@@ -148 +148 @@
     private variable _legendPending 0
     private variable _field      ""
-    private variable _colorMode "scalar";       #  Mode of colormap (vmag or scalar)
-    private variable _fieldNames {} 
-    private variable _fields 
+    private variable _colorMode "scalar";        #  Mode of colormap (vmag or scalar)
+    private variable _fieldNames {}
+    private variable _fields
     private variable _curFldName ""
     private variable _curFldLabel ""
@@ -243 +243 @@
     itk_component add fieldmenu {
         menu $itk_component(plotarea).menu -bg black -fg white -relief flat \
-            -tearoff 0 
+            -tearoff 0
     } {
         usual
@@ -263 +263 @@
 
     set _map(id) [$c create image 0 0 -anchor nw -image $_image(plot)]
-    set _map(cwidth) -1 
-    set _map(cheight) -1 
+    set _map(cwidth) -1
+    set _map(cheight) -1
     set _map(zoom) 1.0
     set _map(original) ""
@@ -311 +311 @@
             -offimage [Rappture::icon volume-off] \
             -variable [itcl::scope _settings(-surfacevisible)] \
-            -command [itcl::code $this AdjustSetting -surfacevisible] 
+            -command [itcl::code $this AdjustSetting -surfacevisible]
     }
     $itk_component(surface) select
@@ -329 +329 @@
     set _image(legend) [image create photo]
     itk_component add legend {
-        canvas $itk_component(plotarea).legend -width 50 -highlightthickness 0 
+        canvas $itk_component(plotarea).legend -width 50 -highlightthickness 0
     } {
         usual
@@ -336 +336 @@
     }
 
-    # Hack around the Tk panewindow.  The problem is that the requested 
+    # Hack around the Tk panewindow.  The problem is that the requested
     # size of the 3d view isn't set until an image is retrieved from
     # the server.  So the panewindow uses the tiny size.
@@ -342 +342 @@
     pack forget $itk_component(view)
     blt::table $itk_component(plotarea) \
-        0,0 $itk_component(view) -fill both -reqwidth $w 
+        0,0 $itk_component(view) -fill both -reqwidth $w
     blt::table configure $itk_component(plotarea) c1 -resize none
 
@@ -429 +429 @@
 
 itcl::body Rappture::VtkSurfaceViewer::DoRotate {} {
-    SendCmd "camera orient [ViewToQuaternion]" 
+    SendCmd "camera orient [ViewToQuaternion]"
     set _rotatePending 0
 }
@@ -456 +456 @@
     if { !$_rotatePending } {
         set _rotatePending 1
-        global rotate_delay 
+        global rotate_delay
         $_dispatcher event -after $rotate_delay !rotate
     }
@@ -555 +555 @@
                     continue
                 }
-                if {[info exists _obj2ovride($dataobj-raise)] && 
+                if {[info exists _obj2ovride($dataobj-raise)] &&
                     $_obj2ovride($dataobj-raise)} {
                     set dlist [linsert $dlist 0 $dataobj]
@@ -583 +583 @@
             }
             return $dlist
-        }           
+        }
         -image {
             if {[llength $args] != 2} {
@@ -819 +819 @@
         #set w [image width $_image(plot)]
         #set h [image height $_image(plot)]
-        #puts stderr "$date: received image ${w}x${h} image"        
+        #puts stderr "$date: received image ${w}x${h} image"
         if { $_start > 0 } {
             set finish [clock clicks -milliseconds]
@@ -890 +890 @@
     # Turn on buffering of commands to the server.  We don't want to
     # be preempted by a server disconnect/reconnect (which automatically
-    # generates a new call to Rebuild).   
+    # generates a new call to Rebuild).
     StartBufferingCommands
 
@@ -960 +960 @@
 
     if { $_first != "" } {
-        $itk_component(field) choices delete 0 end
-        $itk_component(fieldmenu) delete 0 end
-        array unset _fields
+        $itk_component(field) choices delete 0 end
+        $itk_component(fieldmenu) delete 0 end
+        array unset _fields
         set _curFldName ""
         foreach cname [$_first components] {
@@ -990 +990 @@
     InitSettings -isolinesvisible -surfacevisible -outline
     if { $_reset } {
-        # These are settings that rely on a dataset being loaded.
+        # These are settings that rely on a dataset being loaded.
         InitSettings \
             -surfacelighting \
             -field \
             -surfaceedges -surfacelighting -surfaceopacity \
-            -surfacewireframe \
+            -surfacewireframe \
             -numcontours
 
         Zoom reset
-        foreach axis { x y z } {
+        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]
-            if { $label == "" } {
+            set label [$_first hints ${axis}label]
+            if { $label == "" } {
                 set label [string toupper $axis]
-            }
-            # May be a space in the axis label.
-            SendCmd [list axis name $axis $label]
+            }
+            # May be a space in the axis label.
+            SendCmd [list axis name $axis $label]
         }
         if { [array size _fields] < 2 } {
@@ -1032 +1032 @@
 itcl::body Rappture::VtkSurfaceViewer::CurrentDatasets {args} {
     set flag [lindex $args 0]
-    switch -- $flag { 
+    switch -- $flag {
         "-all" {
             if { [llength $args] > 1 } {
@@ -1051 +1051 @@
                 set dlist [get -visible]
             }
-        }           
+        }
         default {
             set dlist $args
@@ -1170 +1170 @@
     foreach tag [CurrentDatasets -visible] {
         SendCmd "dataset getscalar pixel $x $y $tag"
-    } 
+    }
 }
 
@@ -1274 +1274 @@
         "-background" {
             set bgcolor [$itk_component(background) value]
-            array set fgcolors {
-                "black" "white"
-                "white" "black"
-                "grey"  "black"
-            }
+            array set fgcolors {
+                "black" "white"
+                "white" "black"
+                "grey"  "black"
+            }
             configure -plotbackground $bgcolor \
-                -plotforeground $fgcolors($bgcolor)
-            $itk_component(view) delete "legend"
-            DrawLegend
+                -plotforeground $fgcolors($bgcolor)
+            $itk_component(view) delete "legend"
+            DrawLegend
         }
         "-colormap" {
@@ -1289 +1289 @@
             set color [$itk_component(colormap) value]
             set _settings($what) $color
-            if { $color == "none" } {
-                if { $_settings(-colormapvisible) } {
-                    SendCmd "contour2d colormode constant {}"
+            if { $color == "none" } {
+                if { $_settings(-colormapvisible) } {
+                    SendCmd "contour2d colormode constant {}"
                     SendCmd "polydata colormode constant {}"
-                    set _settings(-colormapvisible) 0
-                }
-            } else {
-                if { !$_settings(-colormapvisible) } {
-                    #SendCmd "contour2d colormode $_colorMode $_curFldName"
+                    set _settings(-colormapvisible) 0
+                }
+            } else {
+                if { !$_settings(-colormapvisible) } {
+                    #SendCmd "contour2d colormode $_colorMode $_curFldName"
                     SendCmd "polydata colormode $_colorMode $_curFldName"
-                    set _settings(-colormapvisible) 1
-                }
-                SetCurrentColormap $color
+                    set _settings(-colormapvisible) 1
+                }
+                SetCurrentColormap $color
                 if {$_settings(-colormapdiscrete)} {
                     set numColors [expr $_settings(-numcontours) + 1]
                     SendCmd "colormap res $numColors $color"
                 }
-            }
+            }
             StopBufferingCommands
-            EventuallyRequestLegend
+            EventuallyRequestLegend
         }
         "-colormapdiscrete" {
@@ -1357 +1357 @@
         "-isolinecolor" {
             set color [$itk_component(isolineColor) value]
-            set _settings($what) $color
+            set _settings($what) $color
             SendCmd "contour2d linecolor [Color2RGB $color]"
-            DrawLegend
+            DrawLegend
         }
         "-isolinesvisible" {
             set bool $_settings($what)
-            SendCmd "contour2d visible $bool"
-            DrawLegend
+            SendCmd "contour2d visible $bool"
+            DrawLegend
         }
         "-legendvisible" {
             if { !$_settings($what) } {
                 $itk_component(view) delete legend
-            }
-            DrawLegend
+            }
+            DrawLegend
         }
         "-numcontours" {
@@ -1388 +1388 @@
         "-outline" {
             set bool $_settings($what)
-            SendCmd "outline visible $bool"
+            SendCmd "outline visible $bool"
         }
         "-surfaceedges" {
             set bool $_settings($what)
-            SendCmd "polydata edges $bool"
+            SendCmd "polydata edges $bool"
         }
         "-surfacelighting" {
             set bool $_settings($what)
-            SendCmd "polydata lighting $bool"
+            SendCmd "polydata lighting $bool"
         }
         "-surfaceopacity" {
             set val $_settings($what)
             set sval [expr { 0.01 * double($val) }]
-            SendCmd "polydata opacity $sval"
+            SendCmd "polydata opacity $sval"
         }
         "-surfacevisible" {
             set bool $_settings($what)
-            SendCmd "polydata visible $bool"
+            SendCmd "polydata visible $bool"
             if { $bool } {
                 Rappture::Tooltip::for $itk_component(surface) \
@@ -1413 +1413 @@
                     "Show the surface"
             }
-            DrawLegend
+            DrawLegend
         }
         "-surfacewireframe" {
             set bool $_settings($what)
-            SendCmd "polydata wireframe $bool"
+            SendCmd "polydata wireframe $bool"
         }
         "-xgrid" - "-ygrid" - "-zgrid" {
@@ -1434 +1434 @@
 #
 #       Request a new legend from the server.  The size of the legend
-#       is determined from the height of the canvas.  
+#       is determined from the height of the canvas.
 #
 # This should be called when
-#       1.  A new current colormap is set.
-#       2.  Window is resized.
-#       3.  The limits of the data have changed.  (Just need a redraw).
-#       4.  Number of isolines have changed. (Just need a redraw).
-#       5.  Legend becomes visible (Just need a redraw).
+#        1.  A new current colormap is set.
+#        2.  Window is resized.
+#        3.  The limits of the data have changed.  (Just need a redraw).
+#        4.  Number of isolines have changed. (Just need a redraw).
+#        5.  Legend becomes visible (Just need a redraw).
 #
 itcl::body Rappture::VtkSurfaceViewer::RequestLegend {} {
@@ -1457 +1457 @@
     }
     if { [string match "component*" $fname] } {
-        set title ""
+        set title ""
     } else {
-        if { [info exists _fields($fname)] } {
-            foreach { title units } $_fields($fname) break
-            if { $units != "" } {
-                set title [format "%s (%s)" $title $units]
-            }
-        } else {
-            set title $fname
-        }
+        if { [info exists _fields($fname)] } {
+            foreach { title units } $_fields($fname) break
+            if { $units != "" } {
+                set title [format "%s (%s)" $title $units]
+            }
+        } else {
+            set title $fname
+        }
     }
     # If there's a title too, subtract one more line
     if { $title != "" } {
-        incr h -$lineht 
+        incr h -$lineht
     }
     # Set the legend on the first heightmap dataset.
     if { $_currentColormap != ""  } {
-        set cmap $_currentColormap
-        SendCmdNoWait "legend $cmap scalar $_curFldName {} $w $h 0"
+        set cmap $_currentColormap
+        SendCmdNoWait "legend $cmap scalar $_curFldName {} $w $h 0"
     }
 }
@@ -1495 +1495 @@
     if { [isconnected] } {
         set rgb [Color2RGB $itk_option(-plotforeground)]
-        SendCmd "axis color all $rgb"
+        SendCmd "axis color all $rgb"
         SendCmd "outline color $rgb"
     }
@@ -1558 +1558 @@
         -font "Arial 9"
 
-    label $inner.linecolor_l -text "Isolines" -font "Arial 9" 
+    label $inner.linecolor_l -text "Isolines" -font "Arial 9"
     itk_component add isolineColor {
         Rappture::Combobox $inner.linecolor -width 10 -editable 0
@@ -1572 +1572 @@
         "red"                "red"              \
         "white"              "white"            \
-        "none"               "none"
+        "none"               "none"
 
     $itk_component(isolineColor) value "white"
     bind $inner.linecolor <<Value>> \
-        [itcl::code $this AdjustSetting -isolinecolor]
-
-    label $inner.background_l -text "Background" -font "Arial 9" 
+        [itcl::code $this AdjustSetting -isolinecolor]
+
+    label $inner.background_l -text "Background" -font "Arial 9"
     itk_component add background {
         Rappture::Combobox $inner.background -width 10 -editable 0
@@ -1585 +1585 @@
         "black"              "black"            \
         "white"              "white"            \
-        "grey"               "grey"             
+        "grey"               "grey"
 
     $itk_component(background) value $_settings(-background)
@@ -1599 +1599 @@
 
     itk_component add field_l {
-        label $inner.field_l -text "Field" -font "Arial 9" 
+        label $inner.field_l -text "Field" -font "Arial 9"
     } {
         ignore -font
@@ -1609 +1609 @@
         [itcl::code $this AdjustSetting -field]
 
-    label $inner.colormap_l -text "Colormap" -font "Arial 9" 
+    label $inner.colormap_l -text "Colormap" -font "Arial 9"
     itk_component add colormap {
         Rappture::Combobox $inner.colormap -width 10 -editable 0
@@ -1635 +1635 @@
         2,0 $inner.linecolor_l  -anchor w -pady 2  \
         2,1 $inner.linecolor    -anchor w -pady 2 -fill x  \
-        3,0 $inner.background_l -anchor w -pady 2 \
-        3,1 $inner.background -anchor w -pady 2  -fill x \
+        3,0 $inner.background_l -anchor w -pady 2 \
+        3,1 $inner.background -anchor w -pady 2  -fill x \
         4,0 $inner.numcontours_l -anchor w -pady 2 \
         4,1 $inner.numcontours -anchor w -pady 2 \
@@ -1674 +1674 @@
         -command [itcl::code $this AdjustSetting -axislabels] \
         -font "Arial 9"
-    label $inner.grid_l -text "Grid" -font "Arial 9" 
+    label $inner.grid_l -text "Grid" -font "Arial 9"
     checkbutton $inner.xgrid \
         -text "X" \
@@ -1696 +1696 @@
         -font "Arial 9"
 
-    label $inner.mode_l -text "Mode" -font "Arial 9" 
+    label $inner.mode_l -text "Mode" -font "Arial 9"
 
     itk_component add axisMode {
@@ -1705 +1705 @@
         "closest_triad"   "closest" \
         "furthest_triad"  "farthest" \
-        "outer_edges"     "outer"         
+        "outer_edges"     "outer"
     $itk_component(axisMode) value $_settings(-axismode)
     bind $inner.mode <<Value>> [itcl::code $this AdjustSetting -axismode]
@@ -1777 +1777 @@
 
 #
-#  camera -- 
+#  camera --
 #
 itcl::body Rappture::VtkSurfaceViewer::camera {option args} {
-    switch -- $option { 
+    switch -- $option {
         "show" {
             puts [array get _view]
@@ -1828 +1828 @@
 
 itcl::body Rappture::VtkSurfaceViewer::GetImage { args } {
-    if { [image width $_image(download)] > 0 && 
+    if { [image width $_image(download)] > 0 &&
          [image height $_image(download)] > 0 } {
         set bytes [$_image(download) data -format "jpeg -quality 100"]
@@ -1841 +1841 @@
         -title "[Rappture::filexfer::label downloadWord] as..."
     set inner [$popup component inner]
-    label $inner.summary -text "" -anchor w 
+    label $inner.summary -text "" -anchor w
     radiobutton $inner.vtk_button -text "VTK data file" \
         -variable [itcl::scope _downloadPopup(format)] \
         -font "Arial 9 " \
-        -value vtk  
+        -value vtk
     Rappture::Tooltip::for $inner.vtk_button "Save as VTK data file."
     radiobutton $inner.image_button -text "Image File" \
         -variable [itcl::scope _downloadPopup(format)] \
         -font "Arial 9 " \
-        -value image 
+        -value image
     Rappture::Tooltip::for $inner.image_button \
         "Save as digital image."
@@ -1871 +1871 @@
         2,0 $inner.image_button -anchor w -cspan 2 -padx { 4 0 } \
         4,1 $inner.cancel -width .9i -fill y \
-        4,0 $inner.ok -padx 2 -width .9i -fill y 
+        4,0 $inner.ok -padx 2 -width .9i -fill y
     blt::table configure $inner r3 -height 4
     blt::table configure $inner r4 -pady 4
@@ -1932 +1932 @@
     set _settings(-isolinesvisible) $style(-isolinesvisible)
     set _settings(-surfacevisible) $style(-surfacevisible)
- 
+
     SendCmd "outline add $tag"
     SendCmd "outline color [Color2RGB $itk_option(-plotforeground)] $tag"
@@ -1948 +1948 @@
     SendCmd "polydata opacity $style(-opacity) $tag"
     set _settings(-surfaceopacity) [expr $style(-opacity) * 100.0]
-    SetCurrentColormap $style(-color) 
+    SetCurrentColormap $style(-color)
     SendCmd "polydata wireframe $style(-wireframe) $tag"
     set _settings(-surfacewireframe) $style(-wireframe)
@@ -2003 +2003 @@
     set font "Arial 8"
     set lineht [font metrics $font -linespace]
-    
+
     set ih [image height $_image(legend)]
     set iy [expr $y - ($lineht + 2)]
 
     if { [string match "component*" $fname] } {
-        set title ""
+        set title ""
     } else {
-        if { [info exists _fields($fname)] } {
-            foreach { title units } $_fields($fname) break
-            if { $units != "" } {
-                set title [format "%s (%s)" $title $units]
-            }
-        } else {
-            set title $fname
-        }
+        if { [info exists _fields($fname)] } {
+            foreach { title units } $_fields($fname) break
+            if { $units != "" } {
+                set title [format "%s (%s)" $title $units]
+            }
+        } else {
+            set title $fname
+        }
     }
     # If there's a legend title, increase the offset by the line height.
@@ -2031 +2031 @@
     }
     set color [eval format "\#%02x%02x%02x" $pixel]
-    $_image(swatch) put black  -to 0 0 23 23 
-    $_image(swatch) put $color -to 1 1 22 22 
+    $_image(swatch) put black  -to 0 0 23 23
+    $_image(swatch) put $color -to 1 1 22 22
     .rappturetooltip configure -icon $_image(swatch)
 
@@ -2043 +2043 @@
         set value 0.0
     }
-    set tx [expr $x + 15] 
+    set tx [expr $x + 15]
     set ty [expr $y - 5]
     if { [info exists _isolines($y)] } {
@@ -2050 +2050 @@
         Rappture::Tooltip::text $c [format "$title %g" $value]
     }
-    Rappture::Tooltip::tooltip show $c +$tx,+$ty    
-}
-
-#
-# ReceiveLegend -- 
-#
-#       Invoked automatically whenever the "legend" command comes in from
-#       the rendering server.  Indicates that binary image data with the
-#       specified <size> will follow.
+    Rappture::Tooltip::tooltip show $c +$tx,+$ty
+}
+
+#
+# ReceiveLegend --
+#
+#        Invoked automatically whenever the "legend" command comes in from
+#        the rendering server.  Indicates that binary image data with the
+#        specified <size> will follow.
 #
 itcl::body Rappture::VtkSurfaceViewer::ReceiveLegend { colormap title min max size } {
     #puts stderr "ReceiveLegend colormap=$colormap title=$title range=$min,$max size=$size"
     set _title $title
-    regsub {\(mag\)} $title "" _title 
+    regsub {\(mag\)} $title "" _title
     if { [IsConnected] } {
         set bytes [ReceiveBytes $size]
@@ -2072 +2072 @@
         #puts stderr "read $size bytes for [image width $_image(legend)]x[image height $_image(legend)] legend>"
         if { [catch {DrawLegend} errs] != 0 } {
-            global errorInfo
-            puts stderr "errs=$errs errorInfo=$errorInfo"
+            global errorInfo
+            puts stderr "errs=$errs errorInfo=$errorInfo"
         }
     }
@@ -2092 +2092 @@
 
     if { [string match "component*" $fname] } {
-        set title ""
+        set title ""
     } else {
-        if { [info exists _fields($fname)] } {
-            foreach { title units } $_fields($fname) break
-            if { $units != "" } {
-                set title [format "%s (%s)" $title $units]
-            }
-        } else {
-            set title $fname
-        }
+        if { [info exists _fields($fname)] } {
+            foreach { title units } $_fields($fname) break
+            if { $units != "" } {
+                set title [format "%s (%s)" $title $units]
+            }
+        } else {
+            set title $fname
+        }
     }
     set x [expr $w - 2]
     if { !$_settings(-legendvisible) } {
-        $c delete legend
-        return
-    } 
+        $c delete legend
+        return
+    }
     if { [$c find withtag "legend"] == "" } {
-        set y 2 
-        # If there's a legend title, create a text item for the title.
+        set y 2
+        # If there's a legend title, create a text item for the title.
         $c create text $x $y \
-            -anchor ne \
-            -fill $itk_option(-plotforeground) -tags "title legend" \
-            -font $font 
+            -anchor ne \
+            -fill $itk_option(-plotforeground) -tags "title legend" \
+            -font $font
         if { $title != "" } {
             incr y $lineht
         }
-        $c create text $x $y \
-            -anchor ne \
-            -fill $itk_option(-plotforeground) -tags "vmax legend" \
-            -font $font
-        incr y $lineht
-        $c create image $x $y \
-            -anchor ne \
-            -image $_image(legend) -tags "colormap legend"
-        $c create rectangle $x $y 1 1 \
-            -fill "" -outline "" -tags "sensor legend"
-        $c create text $x [expr {$h-2}] \
-            -anchor se \
-            -fill $itk_option(-plotforeground) -tags "vmin legend" \
-            -font $font
-        $c bind sensor <Enter> [itcl::code $this EnterLegend %x %y]
-        $c bind sensor <Leave> [itcl::code $this LeaveLegend]
-        $c bind sensor <Motion> [itcl::code $this MotionLegend %x %y]
+        $c create text $x $y \
+            -anchor ne \
+            -fill $itk_option(-plotforeground) -tags "vmax legend" \
+            -font $font
+        incr y $lineht
+        $c create image $x $y \
+            -anchor ne \
+            -image $_image(legend) -tags "colormap legend"
+        $c create rectangle $x $y 1 1 \
+            -fill "" -outline "" -tags "sensor legend"
+        $c create text $x [expr {$h-2}] \
+            -anchor se \
+            -fill $itk_option(-plotforeground) -tags "vmin legend" \
+            -font $font
+        $c bind sensor <Enter> [itcl::code $this EnterLegend %x %y]
+        $c bind sensor <Leave> [itcl::code $this LeaveLegend]
+        $c bind sensor <Motion> [itcl::code $this MotionLegend %x %y]
     }
     $c delete isoline
@@ -2153 +2153 @@
         }
         set tags "isoline legend"
-        set offset [expr 2 + $lineht]
-        if { $title != "" } {
-            incr offset $lineht
-        }
+        set offset [expr 2 + $lineht]
+        if { $title != "" } {
+            incr offset $lineht
+        }
         foreach value $_contourList {
             set norm [expr 1.0 - (($value - $vmin) / $range)]
@@ -2175 +2175 @@
     if { [info exists _limits($_curFldName)] } {
         foreach { vmin vmax } $_limits($_curFldName) break
-        $c itemconfigure vmin -text [format %g $vmin]
-        $c itemconfigure vmax -text [format %g $vmax]
+        $c itemconfigure vmin -text [format %g $vmin]
+        $c itemconfigure vmax -text [format %g $vmax]
     }
     set y 2
@@ -2182 +2182 @@
     if { $title != "" } {
         $c itemconfigure title -text $title
-        $c coords title $x $y
-        incr y $lineht
+        $c coords title $x $y
+        incr y $lineht
         $c raise title
     }
@@ -2206 +2206 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::VtkSurfaceViewer::Combo {option} {
-    set c $itk_component(view) 
+    set c $itk_component(view)
     switch -- $option {
         post {
@@ -2221 +2221 @@
         }
         deactivate {
-            $c itemconfigure title -fill $itk_option(-plotforeground) 
+            $c itemconfigure title -fill $itk_option(-plotforeground)
         }
         invoke {
@@ -2239 +2239 @@
     # Keep track of the colormaps that we build.
     if { ![info exists _colormaps($name)] } {
-        BuildColormap $name 
+        BuildColormap $name
         set _colormaps($name) 1
     }
@@ -2261 +2261 @@
 }
 
-itcl::body Rappture::VtkSurfaceViewer::SetOrientation { side } { 
+itcl::body Rappture::VtkSurfaceViewer::SetOrientation { side } {
     array set positions {
         front "1 0 0 0"
@@ -2282 +2282 @@
 }
 
-itcl::body Rappture::VtkSurfaceViewer::UpdateContourList {} { 
+itcl::body Rappture::VtkSurfaceViewer::UpdateContourList {} {
     if { ![info exists _limits($_curFldName)] } {
         return

branches/1.4/gui/scripts/vtkviewer.tcl

@@ -1 @@
-# -*- mode: tcl; indent-tabs-mode: nil -*- 
+# -*- mode: tcl; indent-tabs-mode: nil -*-
 # ----------------------------------------------------------------------
 #  COMPONENT: vtkviewer - Vtk drawing object viewer
@@ -58 +58 @@
     public method isconnected {}
     public method limits { dataobj }
-    public method parameters {title args} { 
-        # do nothing 
+    public method parameters {title args} {
+        # do nothing
     }
     public method scale {args}
@@ -69 +69 @@
     private method BuildColormap { name styles }
     private method BuildCutawayTab {}
-    private method BuildDownloadPopup { widget command } 
+    private method BuildDownloadPopup { widget command }
     private method BuildGlyphsTab {}
     private method BuildMoleculeTab {}
@@ -80 +80 @@
     private method DoRotate {}
     private method DrawLegend {}
-    private method EnterLegend { x y } 
-    private method EventuallyResize { w h } 
-    private method EventuallyRotate { q } 
-    private method EventuallySetAtomScale { args } 
-    private method EventuallySetBondScale { args } 
-    private method EventuallySetGlyphsOpacity { args } 
-    private method EventuallySetMoleculeOpacity { args } 
-    private method EventuallySetMoleculeQuality { args } 
-    private method EventuallySetPolydataOpacity { args } 
-    private method GetImage { args } 
-    private method GetVtkData { args } 
+    private method EnterLegend { x y }
+    private method EventuallyResize { w h }
+    private method EventuallyRotate { q }
+    private method EventuallySetAtomScale { args }
+    private method EventuallySetBondScale { args }
+    private method EventuallySetGlyphsOpacity { args }
+    private method EventuallySetMoleculeOpacity { args }
+    private method EventuallySetMoleculeQuality { args }
+    private method EventuallySetPolydataOpacity { args }
+    private method GetImage { args }
+    private method GetVtkData { args }
     private method InitSettings { args  }
-    private method IsValidObject { dataobj } 
+    private method IsValidObject { dataobj }
     private method LeaveLegend {}
-    private method MotionLegend { x y } 
+    private method MotionLegend { x y }
     private method Pan {option x y}
     private method PanCamera {}
     private method Pick {x y}
-    private method QuaternionToView { q } { 
+    private method QuaternionToView { q } {
         foreach { _view(-qw) _view(-qx) _view(-qy) _view(-qz) } $q break
     }
@@ -114 +114 @@
     private method SetMoleculeOpacity {}
     private method SetMoleculeQuality {}
-    private method SetObjectStyle { dataobj comp } 
+    private method SetObjectStyle { dataobj comp }
     private method SetOpacity { dataset }
     private method SetOrientation { side }
     private method SetPolydataOpacity {}
-    private method Slice {option args} 
-    private method ViewToQuaternion {} { 
+    private method Slice {option args}
+    private method ViewToQuaternion {} {
         return [list $_view(-qw) $_view(-qx) $_view(-qy) $_view(-qz)]
     }
@@ -125 +125 @@
 
     private variable _arcball ""
-    private variable _dlist "";         # list of data objects
+    private variable _dlist "";         # list of data objects
     private variable _obj2datasets
-    private variable _obj2ovride;       # maps dataobj => style override
-    private variable _datasets;         # contains all the dataobj-component 
-                                        # datasets in the server
-    private variable _colormaps;        # contains all the colormaps
-                                        # in the server.
-    private variable _dataset2style;    # maps dataobj-component to transfunc
-    private variable _style2datasets;   # maps tf back to list of 
-                                        # dataobj-components using the tf.
+    private variable _obj2ovride;       # maps dataobj => style override
+    private variable _datasets;         # contains all the dataobj-component
+                                        # datasets in the server
+    private variable _colormaps;        # contains all the colormaps
+                                        # in the server.
+    private variable _dataset2style;    # maps dataobj-component to transfunc
+    private variable _style2datasets;   # maps tf back to list of
+                                        # dataobj-components using the tf.
     private variable _click;            # info used for rotate operations
     private variable _limits;           # autoscale min/max for all axes
@@ -319 +319 @@
 
     set _map(id) [$c create image 0 0 -anchor nw -image $_image(plot)]
-    set _map(cwidth) -1 
-    set _map(cheight) -1 
+    set _map(cwidth) -1
+    set _map(cheight) -1
     set _map(zoom) 1.0
     set _map(original) ""
@@ -373 +373 @@
     set _image(legend) [image create photo]
     itk_component add legend {
-        canvas $itk_component(plotarea).legend -width 50 -highlightthickness 0 
+        canvas $itk_component(plotarea).legend -width 50 -highlightthickness 0
     } {
         usual
@@ -380 +380 @@
     }
 
-    # Hack around the Tk panewindow.  The problem is that the requested 
+    # Hack around the Tk panewindow.  The problem is that the requested
     # size of the 3d view isn't set until an image is retrieved from
     # the server.  So the panewindow uses the tiny size.
@@ -386 +386 @@
     pack forget $itk_component(view)
     blt::table $itk_component(plotarea) \
-        0,0 $itk_component(view) -fill both -reqwidth $w 
+        0,0 $itk_component(view) -fill both -reqwidth $w
     blt::table configure $itk_component(plotarea) c1 -resize none
 
@@ -473 +473 @@
 
 itcl::body Rappture::VtkViewer::DoRotate {} {
-    SendCmd "camera orient [ViewToQuaternion]" 
+    SendCmd "camera orient [ViewToQuaternion]"
     set _rotatePending 0
 }
@@ -674 +674 @@
                     continue
                 }
-                if {[info exists _obj2ovride($dataobj-raise)] && 
+                if {[info exists _obj2ovride($dataobj-raise)] &&
                     $_obj2ovride($dataobj-raise)} {
                     set dlist [linsert $dlist 0 $dataobj]
@@ -702 +702 @@
             }
             return $dlist
-        }           
+        }
         -image {
             if {[llength $args] != 2} {
@@ -925 +925 @@
     # disconnected -- no more data sitting on server
     set _outbuf ""
-    array unset _datasets 
-    array unset _data 
-    array unset _colormaps 
+    array unset _datasets
+    array unset _data
+    array unset _colormaps
     global readyForNextFrame
     set readyForNextFrame 1
@@ -1029 +1029 @@
     # Turn on buffering of commands to the server.  We don't want to
     # be preempted by a server disconnect/reconnect (which automatically
-    # generates a new call to Rebuild).   
+    # generates a new call to Rebuild).
     StartBufferingCommands
 
@@ -1123 +1123 @@
         if { $_haveGlyphs } {
             InitSettings glyphs-edges glyphs-lighting glyphs-opacity \
-                glyphs-visible glyphs-wireframe 
+                glyphs-visible glyphs-wireframe
         }
         if { $_havePolydata } {
             InitSettings polydata-edges polydata-lighting polydata-opacity \
-                polydata-visible polydata-wireframe 
+                polydata-visible polydata-wireframe
         }
         if { $_haveMolecules } {
@@ -1147 +1147 @@
 
     if { $_haveMolecules } {
-        #InitSettings molecule-representation 
+        #InitSettings molecule-representation
     }
     set _reset 0
@@ -1170 +1170 @@
 itcl::body Rappture::VtkViewer::CurrentDatasets {args} {
     set flag [lindex $args 0]
-    switch -- $flag { 
+    switch -- $flag {
         "-all" {
             if { [llength $args] > 1 } {
@@ -1189 +1189 @@
                 set dlist [get -visible]
             }
-        }           
+        }
         default {
             set dlist $args
@@ -1308 +1308 @@
     foreach tag [CurrentDatasets -visible] {
         SendCmd "dataset getscalar pixel $x $y $tag"
-    } 
+    }
 }
 
@@ -1754 +1754 @@
             }
         }
-        "axis-xposition" - "axis-yposition" - "axis-zposition" - 
+        "axis-xposition" - "axis-yposition" - "axis-zposition" -
         "axis-xdirection" - "axis-ydirection" - "axis-zdirection" {
             set axis [string range $what 5 5]
@@ -1912 +1912 @@
             set f [open "$tmpfile" "w"]
             fconfigure $f -translation binary -encoding binary
-            puts $f $data 
+            puts $f $data
             close $f
             set reader [vtkDataSetReader $tag-xvtkDataSetReader]
@@ -2006 +2006 @@
         -variable [itcl::scope _settings(glyphs-visible)] \
         -command [itcl::code $this AdjustSetting glyphs-visible] \
-        -font "Arial 9" -anchor w 
+        -font "Arial 9" -anchor w
 
     checkbutton $inner.outline \
@@ -2012 +2012 @@
         -variable [itcl::scope _settings(glyphs-outline)] \
         -command [itcl::code $this AdjustSetting glyphs-outline] \
-        -font "Arial 9" -anchor w 
+        -font "Arial 9" -anchor w
 
     checkbutton $inner.wireframe \
@@ -2018 +2018 @@
         -variable [itcl::scope _settings(glyphs-wireframe)] \
         -command [itcl::code $this AdjustSetting glyphs-wireframe] \
-        -font "Arial 9" -anchor w 
+        -font "Arial 9" -anchor w
 
     checkbutton $inner.lighting \
@@ -2032 +2032 @@
         -font "Arial 9" -anchor w
 
-    label $inner.palette_l -text "Palette" -font "Arial 9" -anchor w 
+    label $inner.palette_l -text "Palette" -font "Arial 9" -anchor w
     itk_component add glyphspalette {
         Rappture::Combobox $inner.palette -width 10 -editable no
@@ -2041 +2041 @@
         [itcl::code $this AdjustSetting glyphs-palette]
 
-    label $inner.opacity_l -text "Opacity" -font "Arial 9" -anchor w 
+    label $inner.opacity_l -text "Opacity" -font "Arial 9" -anchor w
     ::scale $inner.opacity -from 0 -to 100 -orient horizontal \
         -variable [itcl::scope _settings(glyphs-opacity)] \
@@ -2058 +2058 @@
         5,1 $inner.opacity   -fill x   -pady 2 \
         6,0 $inner.palette_l -anchor w -pady 2 \
-        6,1 $inner.palette   -fill x   -pady 2  
+        6,1 $inner.palette   -fill x   -pady 2
 
     blt::table configure $inner r* c* -resize none
@@ -2078 +2078 @@
         -variable [itcl::scope _settings(polydata-visible)] \
         -command [itcl::code $this AdjustSetting polydata-visible] \
-        -font "Arial 9" -anchor w 
+        -font "Arial 9" -anchor w
 
     checkbutton $inner.outline \
@@ -2084 +2084 @@
         -variable [itcl::scope _settings(polydata-outline)] \
         -command [itcl::code $this AdjustSetting polydata-outline] \
-        -font "Arial 9" -anchor w 
+        -font "Arial 9" -anchor w
 
     checkbutton $inner.wireframe \
@@ -2090 +2090 @@
         -variable [itcl::scope _settings(polydata-wireframe)] \
         -command [itcl::code $this AdjustSetting polydata-wireframe] \
-        -font "Arial 9" -anchor w 
+        -font "Arial 9" -anchor w
 
     checkbutton $inner.lighting \
@@ -2104 +2104 @@
         -font "Arial 9" -anchor w
 
-    label $inner.palette_l -text "Palette" -font "Arial 9" -anchor w 
+    label $inner.palette_l -text "Palette" -font "Arial 9" -anchor w
     itk_component add meshpalette {
         Rappture::Combobox $inner.palette -width 10 -editable no
@@ -2113 +2113 @@
         [itcl::code $this AdjustSetting polydata-palette]
 
-    label $inner.opacity_l -text "Opacity" -font "Arial 9" -anchor w 
+    label $inner.opacity_l -text "Opacity" -font "Arial 9" -anchor w
     ::scale $inner.opacity -from 0 -to 100 -orient horizontal \
         -variable [itcl::scope _settings(polydata-opacity)] \
@@ -2130 +2130 @@
         5,1 $inner.opacity   -fill x   -pady 2 \
         6,0 $inner.palette_l -anchor w -pady 2 \
-        6,1 $inner.palette   -fill x   -pady 2  
+        6,1 $inner.palette   -fill x   -pady 2
 
     blt::table configure $inner r* c* -resize none
@@ -2157 +2157 @@
         -command [itcl::code $this AdjustSetting axis-labels] \
         -font "Arial 9"
-    label $inner.grid_l -text "Grid" -font "Arial 9" 
+    label $inner.grid_l -text "Grid" -font "Arial 9"
     checkbutton $inner.xgrid \
         -text "X" \
@@ -2179 +2179 @@
         -font "Arial 9"
 
-    label $inner.mode_l -text "Mode" -font "Arial 9" 
+    label $inner.mode_l -text "Mode" -font "Arial 9"
 
     itk_component add axismode {
@@ -2188 +2188 @@
         "closest_triad"   "closest" \
         "furthest_triad"  "farthest" \
-        "outer_edges"     "outer"         
+        "outer_edges"     "outer"
     $itk_component(axismode) value "static"
     bind $inner.mode <<Value>> [itcl::code $this AdjustSetting axis-mode]
@@ -2262 +2262 @@
 
     set fg [option get $itk_component(hull) font Font]
-    
+
     set inner [$itk_component(main) insert end \
         -title "Cutaway Along Axis" \
-        -icon [Rappture::icon cutbutton]] 
+        -icon [Rappture::icon cutbutton]]
 
     $inner configure -borderwidth 4
@@ -2305 +2305 @@
             -variable [itcl::scope _axis(xdirection)]
     }
-    set _axis(xdirection) -1 
+    set _axis(xdirection) -1
     Rappture::Tooltip::for $itk_component(xDirButton) \
         "Toggle the direction of the X-axis cutaway"
@@ -2347 +2347 @@
     Rappture::Tooltip::for $itk_component(yDirButton) \
         "Toggle the direction of the Y-axis cutaway"
-    set _axis(ydirection) -1 
+    set _axis(ydirection) -1
 
     # Z-value slicer...
@@ -2384 +2384 @@
             -variable [itcl::scope _axis(zdirection)]
     }
-    set _axis(zdirection) -1 
+    set _axis(zdirection) -1
     Rappture::Tooltip::for $itk_component(zDirButton) \
         "Toggle the direction of the Z-axis cutaway"
@@ -2452 +2452 @@
     $inner.rep choices insert end \
         "ballandstick"  "Ball and Stick" \
-        "spheres"       "Spheres"        \
-        "sticks"        "Sticks"         \
-        "rods"          "Rods"           \
-        "wireframe"     "Wireframe"      \
-        "spacefilling"  "Space Filling" 
+        "spheres"       "Spheres"        \
+        "sticks"        "Sticks"         \
+        "rods"          "Rods"           \
+        "wireframe"     "Wireframe"      \
+        "spacefilling"  "Space Filling"
 
     bind $inner.rep <<Value>> \
@@ -2469 +2469 @@
     }
     $inner.rscale choices insert end \
-        "atomic"        "Atomic"   \
-        "covalent"      "Covalent" \
-        "van_der_waals" "VDW"      \
-        "none"          "Constant"
+        "atomic"        "Atomic"   \
+        "covalent"      "Covalent" \
+        "van_der_waals" "VDW"      \
+        "none"          "Constant"
 
     bind $inner.rscale <<Value>> \
@@ -2478 +2478 @@
     $inner.rscale value "Covalent"
 
-    label $inner.palette_l -text "Palette" -font "Arial 9" 
+    label $inner.palette_l -text "Palette" -font "Arial 9"
     itk_component add moleculepalette {
         Rappture::Combobox $inner.palette -width 10 -editable no
@@ -2543 +2543 @@
         16,0 $inner.quality_l   -anchor w -pady {3 0} \
         17,0 $inner.quality     -fill x    -padx 2
-    
+
     blt::table configure $inner r* -resize none
     blt::table configure $inner r18 -resize expand
@@ -2549 +2549 @@
 
 #
-#  camera -- 
+#  camera --
 #
 itcl::body Rappture::VtkViewer::camera {option args} {
-    switch -- $option { 
+    switch -- $option {
         "show" {
             puts [array get _view]
@@ -2600 +2600 @@
 
 itcl::body Rappture::VtkViewer::GetImage { args } {
-    if { [image width $_image(download)] > 0 && 
+    if { [image width $_image(download)] > 0 &&
          [image height $_image(download)] > 0 } {
         set bytes [$_image(download) data -format "jpeg -quality 100"]
@@ -2613 +2613 @@
         -title "[Rappture::filexfer::label downloadWord] as..."
     set inner [$popup component inner]
-    label $inner.summary -text "" -anchor w 
+    label $inner.summary -text "" -anchor w
     radiobutton $inner.vtk_button -text "VTK data file" \
         -variable [itcl::scope _downloadPopup(format)] \
         -font "Helvetica 9 " \
-        -value vtk  
+        -value vtk
     Rappture::Tooltip::for $inner.vtk_button "Save as VTK data file."
     radiobutton $inner.image_button -text "Image File" \
         -variable [itcl::scope _downloadPopup(format)] \
-        -value image 
+        -value image
     Rappture::Tooltip::for $inner.image_button \
         "Save as digital image."
@@ -2642 +2642 @@
         2,0 $inner.image_button -anchor w -cspan 2 -padx { 4 0 } \
         4,1 $inner.cancel -width .9i -fill y \
-        4,0 $inner.ok -padx 2 -width .9i -fill y 
+        4,0 $inner.ok -padx 2 -width .9i -fill y
     blt::table configure $inner r3 -height 4
     blt::table configure $inner r4 -pady 4
@@ -2919 +2919 @@
     set font "Arial 8"
     set lineht [font metrics $font -linespace]
-    
+
     if { $_settings(legend) } {
         set x [expr $w - 2]
@@ -2984 +2984 @@
     set font "Arial 8"
     set lineht [font metrics $font -linespace]
-    
+
     set imgHeight [image height $_image(legend)]
     set coords [$c coords colormap]
@@ -2998 +2998 @@
     }
     set color [eval format "\#%02x%02x%02x" $pixel]
-    $_image(swatch) put black  -to 0 0 23 23 
-    $_image(swatch) put $color -to 1 1 22 22 
+    $_image(swatch) put black  -to 0 0 23 23
+    $_image(swatch) put $color -to 1 1 22 22
     .rappturetooltip configure -icon $_image(swatch)
 
@@ -3005 +3005 @@
     set t [expr 1.0 - (double($imgY) / double($imgHeight-1))]
     set value [expr $t * ($_limits(vmax) - $_limits(vmin)) + $_limits(vmin)]
-    set tipx [expr $x + 15] 
+    set tipx [expr $x + 15]
     set tipy [expr $y - 5]
     Rappture::Tooltip::text $c "$_title $value"
-    Rappture::Tooltip::tooltip show $c +$tipx,+$tipy    
+    Rappture::Tooltip::tooltip show $c +$tipx,+$tipy
 }
 
@@ -3041 +3041 @@
 }
 
-itcl::body Rappture::VtkViewer::SetOrientation { side } { 
+itcl::body Rappture::VtkViewer::SetOrientation { side } {
     array set positions {
         front "1 0 0 0"
@@ -3052 +3052 @@
     foreach name { -qw -qx -qy -qz } value $positions($side) {
         set _view($name) $value
-    } 
+    }
     set q [ViewToQuaternion]
     $_arcball quaternion $q
@@ -3062 +3062 @@
 }
 
-itcl::body Rappture::VtkViewer::SetOpacity { dataset } { 
+itcl::body Rappture::VtkViewer::SetOpacity { dataset } {
     foreach {dataobj comp} [split $dataset -] break
     set type [$dataobj type $comp]