Changeset 3546 for trunk/gui/scripts/field.tcl

Timestamp:

Mar 20, 2013 3:15:43 PM (11 years ago)

Author:

gah

Message:

start of fix for multiple fields in isosurfaces

File:

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

trunk/gui/scripts/field.tcl

@@ -80 +80 @@
     private variable _hints 
     private variable _viewer "";        # Hints which viewer to use
+    private variable _xv "";            # For 1D meshes only.  Holds the points
     constructor {xmlobj path} { 
         # defined below 
@@ -278 +279 @@
     if { [info exists _comp2vtk($cname)] } {
         # FIXME: extract mesh from VTK file data.
+        if { $_comp2dims($cname) == "1D" } {
+            return $_xv
+        } 
         error "method \"mesh\" is not implemented for VTK file data"
     }
@@ -314 +318 @@
     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"
     }
@@ -731 +738 @@
                 set type "dx"
             }
+        } elseif {[$_fldObj element $cname.ucd] != ""} {
+            set type "ucd"
         }
         set _comp2style($cname) ""
@@ -843 +852 @@
             }
             incr _counter
-        } elseif {[$_fldObj element $cname.ucd] != ""} {
-            set _viewer "isosurface"
-            set _comp2dims($cname) "3D"
+        } elseif { $type == "ucd"} {
             set contents [$_fldObj get $cname.ucd]
             set vtkdata [AvsToVtk $cname $contents]
@@ -1144 +1151 @@
     }
     set _comp2dims($cname) ${_dim}D
+    if { $_dim < 2 } {
+        set points [$dataset GetPoints]
+        set numPoints [$points GetNumberOfPoints]
+        puts stderr "\#points are $numPoints"
+        set xv [blt::vector create \#auto]
+        for { set i 0 } { $i < $numPoints } { incr i } {
+            set point [$points GetPoint 0]
+            $xv append [lindex $point 0] 
+        }
+        set yv [blt::vector create \#auto]
+        $yv seq 0 1 [$xv length]
+        set _comp2xy($cname) [list $xv $yv]
+    }
     lappend limits x [list $xmin $xmax] 
     lappend limits y [list $ymin $ymax] 
     lappend limits z [list $zmin $zmax]
     set dataAttrs [$dataset GetPointData]
+    if { $_dim == 1 } {
+        set numArrays [$dataAttrs GetNumberOfArrays]
+        puts stderr "\#arrays are $numArrays"
+    }
     if { $dataAttrs == ""} {
         puts stderr "No point data"
@@ -1378 +1402 @@
 }
 
-itcl::body Rappture::Field::AvsToVtk { comp contents } {
+itcl::body Rappture::Field::AvsToVtk { cname contents } {
     package require vtk
 
+    puts stderr "AVSToVTK"
     set reader $this-datasetreader
     vtkAVSucdReader $reader
 
     # Write the contents to a file just in case it's binary.
-    set tmpfile file[pid].vtk
+    set tmpfile $cname[pid].ucd
     set f [open "$tmpfile" "w"]
     fconfigure $f -translation binary -encoding binary
@@ -1401 +1426 @@
         lappend _scalars $name $name "???"
     }
+    set tmpfile $cname[pid].vtk
     set writer $this-datasetwriter
     vtkDataSetWriter $writer
@@ -1408 +1434 @@
     rename $reader ""
     rename $writer ""
+
     set f [open "$tmpfile" "r"]
     fconfigure $f -translation binary -encoding binary
     set vtkdata [read $f]
     close $f
-    file delete $tmpfile
+    puts stderr "wrote $tmpfile"
+    #file delete $tmpfile
     return $vtkdata
 }