Changeset 4390 for trunk/gui/scripts

Timestamp:

Jun 17, 2014 1:32:05 PM (10 years ago)

Author:

ldelgass

Message:

Fill number of points/cells in mesh obj when reading from VTK file. Also,
report number of mesh points and number of field values in error msg when they
don't match.

Location:

trunk/gui/scripts

Files:

• field.tcl (modified) (2 diffs)
• mesh.tcl (modified) (1 diff)

trunk/gui/scripts/field.tcl

@@ -1558 +1558 @@
         set numComponentsPerPoint [numComponents $cname]
         set numPoints [$mesh numpoints]
-        if { ($numPoints * $numComponentsPerPoint) != $numFieldValues } {
-            puts stderr "ERROR: Number of points in mesh and field values don't agree"
+        set numExpectedPoints [expr $numPoints * $numComponentsPerPoint]
+        if { $numExpectedPoints != $numFieldValues } {
+            puts stderr "ERROR: Number of points in mesh ($numExpectedPoints) and number of field values ($numFieldValues) don't agree"
             return 0
         }
@@ -1593 +1594 @@
         set numComponentsPerPoint [numComponents $cname]
         set numPoints [$mesh numpoints]
-        if { ($numPoints * $numComponentsPerPoint) != $numFieldValues } {
-            puts stderr "ERROR: Number of points in mesh and field values don't agree"
+        set numExpectedPoints [expr $numPoints * $numComponentsPerPoint]
+        if { $numExpectedPoints != $numFieldValues } {
+            puts stderr "ERROR: Number of points in mesh ($numExpectedPoints) and number of field values ($numFieldValues) don't agree"
             return 0
         }

trunk/gui/scripts/mesh.tcl

@@ -482 +482 @@
     $reader Update
     set output [$reader GetOutput]
+    set _numPoints [$output GetNumberOfPoints]
+    set _numCells [$output GetNumberOfCells]
     foreach { xmin xmax ymin ymax zmin zmax } [$output GetBounds] break
     set _limits(x) [list $xmin $xmax]