Changeset 5635 for trunk/gui

Timestamp:

May 29, 2015 7:24:15 PM (9 years ago)

Author:

ldelgass

Message:

Structured grid fixes for Rappture::Mesh

File:

• trunk/gui/scripts/mesh.tcl (modified) (7 diffs)

trunk/gui/scripts/mesh.tcl

@@ -540 +540 @@
         set numCoords [$all length]
         if { [info exists zNum] } {
+            if { ![info exists yNum] || ![info exists xNum] } {
+                puts stderr "WARNING: bad grid \"$path\": missing grid dimension"
+                blt::vector destroy $all $xv $yv $zv
+                return 0
+            }
             set _dim 3
             set _numPoints [expr $xNum * $yNum * $zNum]
@@ -545 +550 @@
             if { ($_numPoints*3) != $numCoords } {
                 puts stderr "WARNING: bad grid \"$path\": invalid grid: \# of points does not match dimensions <xdim> * <ydim> * <zdim>"
+                blt::vector destroy $all $xv $yv $zv
                 return 0
             }
             if { ($numCoords % 3) != 0 } {
                 puts stderr "WARNING: bad grid \"$path\": wrong \# of coordinates for 3D grid"
+                blt::vector destroy $all $xv $yv $zv
                 return 0
             }
@@ -559 +566 @@
             append out "DIMENSIONS $xNum $yNum $zNum\n"
             append out "POINTS $_numPoints double\n"
-            append out [$all range 0 end]
-            append out "\n"
+            foreach x [$xv range 0 end] y [$yv range 0 end] z [$zv range 0 end] {
+                append out "$x $y $z\n"
+            }
             set _vtkdata $out
         } elseif { [info exists yNum] } {
+            if { ![info exists xNum] } {
+                puts stderr "WARNING: bad grid \"$path\": missing grid dimension"
+                blt::vector destroy $all $xv $yv $zv
+                return 0
+            }
             set _dim 2
             set _numPoints [expr $xNum * $yNum]
@@ -568 +581 @@
             if { ($_numPoints*2) != $numCoords } {
                 puts stderr "WARNING: bad grid \"$path\": \# of points does not match dimensions <xdim> * <ydim>"
+                blt::vector destroy $all $xv $yv $zv
                 return 0
             }
             if { ($numCoords % 2) != 0 } {
                 puts stderr "WARNING: bad grid \"$path\": wrong \# of coordinates for 2D grid"
+                blt::vector destroy $all $xv $yv $zv
                 return 0
             }
+            $all split $xv $yv
             foreach axis {x y} {
                 set vector [set ${axis}v]
@@ -584 +600 @@
             append out "DIMENSIONS $xNum $yNum 1\n"
             append out "POINTS $_numPoints double\n"
-            append out [$all range 0 end]
-            append out "\n"
+            foreach x [$xv range 0 end] y [$yv range 0 end] z [$zv range 0 end] {
+                append out "$x $y $z\n"
+            }
             set _vtkdata $out
         } else {
@@ -593 +610 @@
             if { $_numPoints != $numCoords } {
                 puts stderr "WARNING: bad grid \"$path\": \# of points does not match <xdim>"
+                blt::vector destroy $all $xv $yv $zv
                 return 0
             }
+            $all dup $xv
             set _limits(x) [$xv limits]
             set _limits(y) [list 0 0]
@@ -604 +623 @@
             append out "DIMENSIONS $xNum 1 1\n"
             append out "POINTS $_numPoints double\n"
-            append out [$all range 0 end]
-            append out "\n"
+            foreach x [$xv range 0 end] y [$yv range 0 end] z [$zv range 0 end] {
+                append out "$x $y $z\n"
+            }
             set _vtkdata $out
         }