Changeset 5324 for branches/1.4

Timestamp:

Apr 25, 2015, 11:37:38 PM (9 years ago)

Author:

ldelgass

Message:

merge r5323 from trunk

Location:

branches/1.4

Files:

• . (modified) (1 prop)
• gui/scripts/field.tcl (modified) (8 diffs)

branches/1.4/gui/scripts/field.tcl

@@ -158 +158 @@
     protected method ReadVtkDataSet { cname contents }
     private method InitHints {}
-
     private method VerifyVtkDataSet { contents }
     private method VectorLimits { vector vectorsize {comp -1} }
+    private method VtkDataSetToXy { dataset }
 }
 
@@ -886 +886 @@
         } elseif {$type == "dx" || $type == "opendx" } {
             #
-            # HACK ALERT!  Extract gzipped, base64-encoded OpenDX
-            # data.  Assume that it's 3D.  Pass it straight
-            # off to the NanoVis visualizer.
-            #
+            # Extract gzipped, base64-encoded OpenDX data
+            # 
             set viewer [$_field get "about.view"]
             if { $viewer != "" } {
@@ -901 +899 @@
                 }
             }
-            set _dim 3
-            set _comp2dims($cname) "3D"
             set data [$_field get -decode no $cname.$type]
             set contents [Rappture::encoding::decode -as zb64 $data]
@@ -914 +910 @@
                 close $f
             }
+            # Convert to VTK
             if { [catch { Rappture::DxToVtk $contents } vtkdata] == 0 } {
                 unset contents
+                # Read back VTK: this will set the field limits and the mesh
+                # dimensions based on the bounds (sets _dim).  We rely on this
+                # conversion for limits even if we send DX data to nanovis.
                 ReadVtkDataSet $cname $vtkdata
                 if 0 {
@@ -924 +924 @@
             } else {
                 unset contents
-                puts stderr "Can't parse dx data"
+                puts stderr "Can't parse DX data"
+                continue;               # Ignore this component
             }
             if { $_alwaysConvertDX ||
@@ -1235 +1236 @@
     }
     set _comp2dims($cname) ${_dim}D
-    if { $_dim < 2 } {
-        set numPoints [$dataset GetNumberOfPoints]
-        set xv [blt::vector create \#auto]
-        for { set i 0 } { $i < $numPoints } { incr i } {
-            set point [$dataset GetPoint $i]
-            $xv append [lindex $point 0]
-        }
-        set yv [blt::vector create \#auto]
-        set dataAttrs [$dataset GetPointData]
-        if { $dataAttrs == ""} {
-            puts stderr "WARNING: No point data found in \"$_path\""
-            rename $reader ""
-            return 0
-        }
-        set array [$dataAttrs GetScalars]
-        if { $array == ""} {
-            puts stderr "WARNING: No scalar point data found in \"$_path\""
-            rename $reader ""
-            return 0
-        }
-        set numTuples [$array GetNumberOfTuples]
-        for { set i 0 } { $i < $numTuples } { incr i } {
-            $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]
@@ -1296 +1270 @@
 
     rename $reader ""
+}
+
+#
+# VtkDataSetToXy --
+#
+#        Attempt to convert 0 or 1 dimensional VTK DataSet to XY data (curve).
+#
+itcl::body Rappture::Field::VtkDataSetToXy { dataset } {
+    foreach {xmin xmax ymin ymax zmin zmax} [$dataset GetBounds] break
+    # Only X can have non-zero range.  X can have zero range if there is
+    # only one point
+    if { $ymax > $ymin } {
+        return 0
+    }
+    if { $zmax > $zmin } {
+        return 0
+    }
+    set numPoints [$dataset GetNumberOfPoints]
+    set xv [blt::vector create \#auto]
+    for { set i 0 } { $i < $numPoints } { incr i } {
+        set point [$dataset GetPoint $i]
+        $xv append [lindex $point 0]
+    }
+    set yv [blt::vector create \#auto]
+    set dataAttrs [$dataset GetPointData]
+    if { $dataAttrs == ""} {
+        puts stderr "WARNING: No point data found"
+        return 0
+    }
+    set array [$dataAttrs GetScalars]
+    if { $array == ""} {
+        puts stderr "WARNING: No scalar point data found"
+        return 0
+    }
+    # Multi-component scalars (e.g. color scalars) are not supported
+    if { [$array GetNumberOfComponents] != 1 } {
+        return 0
+    }
+    set numTuples [$array GetNumberOfTuples]
+    for { set i 0 } { $i < $numTuples } { incr i } {
+        $yv append [$array GetComponent $i 0]
+    }
+    $xv sort $yv
+    set _comp2xy($cname) [list $xv $yv]
+    return 1
 }
 
@@ -1711 +1730 @@
     }
 
-    # Save viewer choice
-    set viewer $_viewer
     ReadVtkDataSet $cname $data(vtkdata)
-    # Restore viewer choice (ReadVtkDataSet wants to set it to contour/isosurface)
-    set _viewer $viewer
     return $data(vtkdata)
 }