Changeset 3585

Timestamp:

Mar 25, 2013 7:03:02 PM (9 years ago)

Author:

gah

Message:

fix regression: set default viewer for 2D data sets

Location:

trunk/gui/scripts

Files:

• field.tcl (modified) (8 diffs)
• vtkheightmapviewer.tcl (modified) (1 diff)

trunk/gui/scripts/field.tcl

@@ -150 +150 @@
     private method ConvertToVtkData { cname } 
     private method ReadVtkDataSet { cname contents } 
+    private method VerifyVtkDataSet { contents } 
     private method AvsToVtk { cname contents } 
     private variable _values ""
@@ -745 +746 @@
             set type "points-on-mesh"
         } elseif { [$_field element $cname.vtk] != ""} {
+            set type "vtk"
             set viewer [$_field get "about.view"]
-            set type "vtk"
             if { $viewer != "" } {
                 set _viewer $viewer
@@ -1144 +1145 @@
 }
 
+itcl::body Rappture::Field::VerifyVtkDataSet { contents } {
+    package require vtk
+
+    set reader $this-datasetreader
+    vtkDataSetReader $reader
+
+    # Write the contents to a file just in case it's binary.
+    set tmpfile file[pid].vtk
+    set f [open "$tmpfile" "w"]
+    fconfigure $f -translation binary -encoding binary
+    puts $f $contents 
+    close $f
+
+    $reader SetFileName $tmpfile
+    $reader ReadAllScalarsOn
+    $reader ReadAllVectorsOn
+    $reader ReadAllFieldsOn
+    $reader Update
+    set dataset [$reader GetOutput]
+    set points [$dataset GetPoints]
+    set numPoints [$points GetNumberOfPoints]
+    set dataAttrs [$dataset GetPointData]
+    if { $_dim == 1 } {
+        set numArrays [$dataAttrs GetNumberOfArrays]
+    }
+    if { $dataAttrs == ""} {
+        puts stderr "WARNING: no point data found in \"$_path\""
+        return 0
+    }
+    set numArrays [$dataAttrs GetNumberOfArrays]
+    file delete $tmpfile
+    rename $reader ""
+}
+
 itcl::body Rappture::Field::ReadVtkDataSet { cname contents } {
     package require vtk
@@ -1267 +1302 @@
         append out "LOOKUP_TABLE default\n"
         append out "[$vector range 0 end]\n"
+        if 0 {
+            VerifyVtkDataSet $out
+        }
         return $out
     }
@@ -1375 +1413 @@
     set _dim [$mesh dimensions]
     if {$_dim == 1} {
+        # 1D data: Create vectors for graph widget.
         # Is this used anywhere?
         #
@@ -1400 +1439 @@
     } 
     if {$_dim == 2} {
+        # 2D data: By default surface or contour plot using heightmap widget.
         set _type "heightmap"
         set v [blt::vector create \#auto]
@@ -1405 +1445 @@
         if { [$v length] == 0 } {
             return 0
+        }
+        if { $_viewer == "" } {
+            set _viewer "contour"
         }
         set _comp2dims($cname) "[$mesh dimensions]D"
@@ -1418 +1461 @@
     } 
     if {$_dim == 3} {
-        #
-        # 3D data: Store cloud/field as components
-        #
+        # 3D data: By default isosurfaces plot using isosurface widget.
         set values [$_field get $cname.values]
         set farray [vtkFloatArray ::vals$_counter]

trunk/gui/scripts/vtkheightmapviewer.tcl

@@ -547 +547 @@
         set args "-objects"
     }
-
     set op [lindex $args 0]
     switch -- $op {