Changeset 3480 for trunk

Timestamp:

Mar 10, 2013 9:59:17 PM (11 years ago)

Author:

gah

Message:

change private method names in mesh object

File:

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

trunk/gui/scripts/mesh.tcl

@@ -74 +74 @@
     private method ReadUnstructuredGrid { path }
     private method ReadVtk { path }
-    private method ReadTriangles { xv yv zv triangles }
-    private method ReadQuads { xv yv zv quads }
-    private method ReadTetrahedrons { xv yv zv tetrahedrons }
-    private method ReadHexahedrons { xv yv zv hexhedrons }
-    private method ReadWedges { xv yv zv wedges }
-    private method ReadPyramids { xv yv zv pyramids }
-    private method ReadCells { xv yv zv cells celltypes }
-    private method ReadCloud { xv yv zv }
+    private method WriteTriangles { xv yv zv triangles }
+    private method WriteQuads { xv yv zv quads }
+    private method WriteTetrahedrons { xv yv zv tetrahedrons }
+    private method WriteHexahedrons { xv yv zv hexhedrons }
+    private method WriteWedges { xv yv zv wedges }
+    private method WritePyramids { xv yv zv pyramids }
+    private method WriteHybridCells { xv yv zv cells celltypes }
+    private method WritePointCloud { xv yv zv }
     private method GetCellType { name }
     private method GetNumIndices { type }
@@ -401 +401 @@
     append out "$_vtkdata\n"
 
-    # Write the contents to a file just in case it's binary.
+     # Write the contents to a file just in case it's binary.
     set tmpfile file[pid].vtk
     set f [open "$tmpfile" "w"]
@@ -637 +637 @@
 }
 
-itcl::body Rappture::Mesh::ReadCloud { xv yv zv } {
+itcl::body Rappture::Mesh::WritePointCloud { xv yv zv } {
     set _type "cloud"
     set _numPoints [$xv length]
@@ -653 +653 @@
 }
 
-itcl::body Rappture::Mesh::ReadTriangles { xv yv zv triangles } {
+itcl::body Rappture::Mesh::WriteTriangles { xv yv zv triangles } {
     set _type "triangles"
     if { $triangles == "" } { 
@@ -686 +686 @@
 }
 
-itcl::body Rappture::Mesh::ReadQuads { xv yv zv quads } {
+itcl::body Rappture::Mesh::WriteQuads { xv yv zv quads } {
     set _type "quads"
     if { $quads == "" } { 
@@ -719 +719 @@
 }
 
-itcl::body Rappture::Mesh::ReadTetrahedrons { xv yv zv tetras } {
+itcl::body Rappture::Mesh::WriteTetrahedrons { xv yv zv tetras } {
     set _type "tetrahedrons"
     if { $tetras == "" } { 
@@ -752 +752 @@
 }
 
-itcl::body Rappture::Mesh::ReadHexahedrons { xv yv zv hexas } {
+itcl::body Rappture::Mesh::WriteHexahedrons { xv yv zv hexas } {
     set _type "hexahedrons"
     if { $hexas == "" } { 
@@ -785 +785 @@
 }
 
-itcl::body Rappture::Mesh::ReadWedges { xv yv zv wedges } {
+itcl::body Rappture::Mesh::WriteWedges { xv yv zv wedges } {
     set _type "wedges"
     if { $wedges == "" } { 
@@ -818 +818 @@
 }
 
-itcl::body Rappture::Mesh::ReadPyramids { xv yv zv pyramids } {
+itcl::body Rappture::Mesh::WritePyramids { xv yv zv pyramids } {
     set _type "pyramids"
     if { $pyramids == "" } { 
@@ -829 +829 @@
     set celltypes {}
     foreach { a b c d e } $pyramids {
-        append data " 6 $a $b $c $d $e\n"
+        append data " 5 $a $b $c $d $e\n"
         append celltypes "14\n"
         incr count
@@ -838 +838 @@
         append out " $x $y $z\n"
     }
-    append out "CELLS $count [expr $count * 5]\n"
+    append out "CELLS $count [expr $count * 6]\n"
     append out $data
     append out "CELL_TYPES $count\n"
@@ -851 +851 @@
 }
 
-itcl::body Rappture::Mesh::ReadCells { xv yv zv cells celltypes } {
+itcl::body Rappture::Mesh::WriteHybridCells { xv yv zv cells celltypes } {
     set _type "unstructured"
     if { $cells == "" } {
@@ -943 +943 @@
     set _type "unstructured"
 
-    # Step 1: Verify that there's only one cell tag.
+    # Step 1: Verify that there's only one cell tag of any kind.
     set numCells 0
     foreach type { cells triangles quads tetrahedrons 
@@ -977 +977 @@
         set data    [$_xmlobj get $path.unstructured.points]
         if { $zcoords != "" } {
-                error "can't specify <zcoord> with a 2 dimensional mesh"
+                error "can't specify <zcoords> with a 2D mesh"
         }
         if { $xcoords != "" && $ycoords != "" } {
@@ -988 +988 @@
             Rappture::ReadPoints $data dim points
             if { $points == "" } {
-                error "no <points> found for <cells> mesh"
+                error "no <points> found for unstructured grid"
             }
             if { $dim != 2 } {
@@ -1034 +1034 @@
         }
     }
-    # Step 3: Read the cells and write the vtk data.
+    # Step 3: Write the points and cells as vtk data.
     if { $numCells == 0 } {
-        puts stderr "numCells=$numCells call ReadCloud"
-        ReadCloud $xv $yv $zv
+        WritePointCloud $xv $yv $zv
     } elseif { $type == "cells" } {
         set cells [$_xmlobj get $path.unstructured.cells]
-        ReadCells $xv $yv $zv $cells $celltypes
+        WriteHybridCells $xv $yv $zv $cells $celltypes
     } else {
-        puts stderr "type=$type"
-        set cmd "Read[string totitle $type]"
+        set cmd "Write[string totitle $type]"
         set cells [$_xmlobj get $path.unstructured.$type]
         $cmd $xv $yv $zv $cells