Changeset 5002 for trunk/gui

Timestamp:

Feb 11, 2015 2:20:19 PM (9 years ago)

Author:

ldelgass

Message:

Whitespace: trailing spaces

File:

• trunk/gui/scripts/field.tcl (modified) (42 diffs)

trunk/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
 }
 
@@ -75 +75 @@
     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 _isValid 0;        # Indicates if the field contains
@@ -82 +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 }
@@ -126 +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
@@ -143 +143 @@
     private variable _comp2style ;# maps component name => style settings
     private variable _comp2cntls ;# maps component name => x,y control points
-    private variable _comp2extents 
+    private variable _comp2extents
     private variable _comp2limits;        #  Array of limits per component
-    private variable _type "" 
-    private variable _comp2flowhints 
+    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} }
 }
@@ -284 +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)
                 }
             }
@@ -399 +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.
 # ----------------------------------------------------------------------
@@ -423 +423 @@
             1D {
                 switch -- $which {
-                    x - xlin { 
-                        set pos 0; set log 0; set axis x 
+                    x - xlin {
+                        set pos 0; set log 0; set axis x
                     }
-                    xlog { 
-                        set pos 0; set log 1; 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 
+                    y - ylin - v - vlin {
+                        set pos 1; set log 0; set axis y
                     }
-                    ylog - vlog { 
-                        set pos 1; set log 1; set axis y 
+                    ylog - vlog {
+                        set pos 1; set log 1; set axis y
                     }
                     default {
@@ -471 +471 @@
             default {
                 if {[info exists _comp2limits($cname)]} {
-                    array set limits $_comp2limits($cname) 
+                    array set limits $_comp2limits($cname)
                     switch -- $which {
                         x - xlin - xlog {
@@ -536 +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)] } {
@@ -562 +562 @@
     return ""
 }
- 
+
 # ----------------------------------------------------------------------
 # USAGE: controls get ?<name>?
@@ -786 +786 @@
             if { [info exists env(VTKVOLUME)] } {
                 set _viewer "vtkvolume"
-            } 
+            }
             set type "opendx"
         } elseif {[$_field element $cname.dx] != ""} {
@@ -808 +808 @@
             set extents [$_field get $cname.extents]
         } else {
-            set extents 1 
+            set extents 1
         }
         set _comp2extents($cname) $extents
@@ -972 +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 ""
@@ -989 +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.
     #
@@ -1061 +1061 @@
 # isunirect2d  --
 #
-# Returns if the field is a unirect2d object.  
+# Returns if the field is a unirect2d object.
 #
 itcl::body Rappture::Field::isunirect2d { } {
@@ -1070 +1070 @@
 # isunirect3d  --
 #
-# Returns if the field is a unirect3d object.  
+# Returns if the field is a unirect3d object.
 #
 itcl::body Rappture::Field::isunirect3d { } {
@@ -1079 +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 } {
@@ -1091 +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 } {
@@ -1128 +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}} {
@@ -1144 +1144 @@
         }
         return $max
-    } 
+    }
     if { $cname == "component0"} {
         set cname [lindex [components -name] 0]
@@ -1161 +1161 @@
     set f [open "$tmpfile" "w"]
     fconfigure $f -translation binary -encoding binary
-    puts $f $contents 
+    puts $f $contents
     close $f
 
@@ -1195 +1195 @@
     set f [open "$tmpfile" "w"]
     fconfigure $f -translation binary -encoding binary
-    puts $f $contents 
+    puts $f $contents
     close $f
 
@@ -1236 +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]
@@ -1253 +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]
@@ -1287 +1287 @@
         }
     }
-    
+
     lappend limits v [list $vmin $vmax]
     set _comp2limits($cname) $limits
@@ -1304 +1304 @@
         set cname "component"
     }
-    # DX: Convert DX to VTK 
+    # DX: Convert DX to VTK
     if {[info exists _comp2dx($cname)]} {
         set data $_comp2dx($cname)
@@ -1310 +1310 @@
         return [Rappture::DxToVtk $data]
     }
-    # VTK file data: 
+    # VTK file data:
     if { [info exists _comp2vtk($cname)] } {
         return $_comp2vtk($cname)
@@ -1364 +1364 @@
             }
         }
-        append out [$vector range 0 end] 
+        append out [$vector range 0 end]
         append out "\n"
         if 0 {
@@ -1413 +1413 @@
             set vectorsize [$_field get $cname.extents]
         } else {
-            set vectorsize 1 
+            set vectorsize 1
         }
         set _type unirect3d
@@ -1428 +1428 @@
             lappend limits $axis [$_comp2unirect3d($cname) limits $axis]
         }
-        # Get the data limits 
+        # Get the data limits
         set vector [$_comp2unirect3d($cname) values]
         set minmax [VectorLimits $vector $vectorsize]
@@ -1446 +1446 @@
             set vectorsize [$_field get $cname.extents]
         } else {
-            set vectorsize 1 
+            set vectorsize 1
         }
         set _type unirect2d
@@ -1482 +1482 @@
             set mesh [Rappture::Mesh::fetch $_xmlobj $path]
             set _type mesh
-        }            
+        }
         "unirect2d" {
             if { $_viewer == "" } {
@@ -1497 +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] {
@@ -1518 +1518 @@
         # Band Structure Lab used to (see isosurface1 test in rappture-bat)
         #
-        # Is there a natural growth path in generating output from 1D to 
+        # 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 
+        # (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]
@@ -1535 +1535 @@
         #incr _counter
         #return 1
-    } 
+    }
     if {$_dim == 2} {
         # 2D data: By default surface or contour plot using heightmap widget.
@@ -1582 +1582 @@
         lappend _comp2limits($cname) v $minmax
         return 1
-    } 
+    }
     if {$_dim == 3} {
         # 3D data: By default isosurfaces plot using isosurface widget.
@@ -1719 +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"
@@ -1741 +1741 @@
         set _comp2assoc($cname) "pointdata"
         return
-    } 
+    }
     switch -- $assoc {
         "pointdata" - "celldata" - "fielddata" {