[cig-commits] r13714 - cs/cigma/trunk/src

[luis at geodynamics.org]

Author: luis
Date: 2008-12-17 02:31:54 -0800 (Wed, 17 Dec 2008)
New Revision: 13714

Modified:
   cs/cigma/trunk/src/io_vtk.cpp
   cs/cigma/trunk/src/io_vtk.h
Log:
Convert vtkCellType to a string so we can display it in the log

Modified: cs/cigma/trunk/src/io_vtk.cpp
===================================================================
--- cs/cigma/trunk/src/io_vtk.cpp	2008-12-17 10:31:52 UTC (rev 13713)
+++ cs/cigma/trunk/src/io_vtk.cpp	2008-12-17 10:31:54 UTC (rev 13714)
@@ -56,6 +56,83 @@
 /* XXX: do we need a vtk_typeclass? */
 
 
+/* get name of cell */
+std::string vtk_cellname(int cellType)
+{
+    switch (cellType)
+    {
+    case VTK_TRIANGLE:                  return "VTK_TRIANGLE";
+    case VTK_QUADRATIC_TRIANGLE:        return "VTK_QUADRATIC_TRIANGLE";
+    case VTK_PARAMETRIC_TRI_SURFACE:    return "VTK_PARAMETRIC_TRI_SURFACE";
+    case VTK_HIGHER_ORDER_TRIANGLE:     return "VTK_HIGHER_ORDER_TRIANGLE";
+
+    case VTK_QUAD:                      return "VTK_QUAD";
+    case VTK_QUADRATIC_QUAD:            return "VTK_QUADRATIC_QUAD";
+    case VTK_PARAMETRIC_QUAD_SURFACE:   return "VTK_PARAMETRIC_QUAD_SURFACE";
+    case VTK_HIGHER_ORDER_QUAD:         return "VTK_HIGHER_ORDER_QUAD";
+
+    case VTK_TETRA:                     return "VTK_TETRA";
+    case VTK_QUADRATIC_TETRA:           return "VTK_QUADRATIC_TETRA";
+    case VTK_PARAMETRIC_TETRA_REGION:   return "VTK_PARAMETRIC_TETRA_REGION";
+    case VTK_HIGHER_ORDER_TETRAHEDRON:  return "VTK_HIGHER_ORDER_TETRAHEDRON";
+
+    case VTK_VOXEL:                     return "VTK_VOXEL";
+    case VTK_HEXAHEDRON:                return "VTK_HEXAHEDRON";
+    case VTK_QUADRATIC_HEXAHEDRON:      return "VTK_QUADRATIC_HEXAHEDRON";
+    case VTK_PARAMETRIC_HEX_REGION:     return "VTK_PARAMETRIC_HEX_REGION";
+    case VTK_HIGHER_ORDER_HEXAHEDRON:   return "VTK_HIGHER_ORDER_HEXAHEDRON";
+
+    default:
+        return "Unidentified Cell Type";
+    }
+
+    return "";
+}
+
+/* get dimension of cell */
+int vtk_celldim(int cellType)
+{
+    TRI_LOG_STR("vtk_celldim()");
+    TRI_LOG(cellType);
+    TRI_LOG(vtk_cellname(cellType));
+
+    if ((cellType == VTK_TRIANGLE) ||
+        (cellType == VTK_QUADRATIC_TRIANGLE) ||
+        (cellType == VTK_PARAMETRIC_TRI_SURFACE) ||
+        (cellType == VTK_HIGHER_ORDER_TRIANGLE))
+    {
+        return 2;
+    }
+
+    if ((cellType == VTK_QUAD) ||
+        (cellType == VTK_QUADRATIC_QUAD) ||
+        (cellType == VTK_PARAMETRIC_QUAD_SURFACE) ||
+        (cellType == VTK_HIGHER_ORDER_QUAD))
+    {
+        return 2;
+    }
+
+    if ((cellType == VTK_TETRA) ||
+        (cellType == VTK_QUADRATIC_TETRA) ||
+        (cellType == VTK_PARAMETRIC_TETRA_REGION) ||
+        (cellType == VTK_HIGHER_ORDER_TETRAHEDRON))
+    {
+        return 3;
+    }
+
+    if ((cellType == VTK_VOXEL) ||
+        (cellType == VTK_HEXAHEDRON) ||
+        (cellType == VTK_QUADRATIC_HEXAHEDRON) ||
+        (cellType == VTK_PARAMETRIC_HEX_REGION) ||
+        (cellType == VTK_HIGHER_ORDER_HEXAHEDRON))
+    {
+        return 3;
+    }
+
+    return -1;
+}
+
+
 /* create and returns a legacy reader */
 vtkDataSetReader* vtk_read_legacy(const char *filename, vtkGridType& gridType)
 {
@@ -148,46 +225,5 @@
 }
 
 
-int vtk_celldim(int cellType)
-{
-    TRI_LOG_STR("vtk_celldim()");
-    TRI_LOG(cellType);
 
-    if ((cellType == VTK_TRIANGLE) ||
-        (cellType == VTK_QUADRATIC_TRIANGLE) ||
-        (cellType == VTK_PARAMETRIC_TRI_SURFACE) ||
-        (cellType == VTK_HIGHER_ORDER_TRIANGLE))
-    {
-        return 2;
-    }
-
-    if ((cellType == VTK_QUAD) ||
-        (cellType == VTK_QUADRATIC_QUAD) ||
-        (cellType == VTK_PARAMETRIC_QUAD_SURFACE) ||
-        (cellType == VTK_HIGHER_ORDER_QUAD))
-    {
-        return 2;
-    }
-
-    if ((cellType == VTK_TETRA) ||
-        (cellType == VTK_QUADRATIC_TETRA) ||
-        (cellType == VTK_PARAMETRIC_TETRA_REGION) ||
-        (cellType == VTK_HIGHER_ORDER_TETRAHEDRON))
-    {
-        return 3;
-    }
-
-    if ((cellType == VTK_VOXEL) ||
-        (cellType == VTK_HEXAHEDRON) ||
-        (cellType == VTK_QUADRATIC_HEXAHEDRON) ||
-        (cellType == VTK_PARAMETRIC_HEX_REGION) ||
-        (cellType == VTK_HIGHER_ORDER_HEXAHEDRON))
-    {
-        return 3;
-    }
-
-    return -1;
-}
-
-
 #endif /* HAVE_VTK */

Modified: cs/cigma/trunk/src/io_vtk.h
===================================================================
--- cs/cigma/trunk/src/io_vtk.h	2008-12-17 10:31:52 UTC (rev 13713)
+++ cs/cigma/trunk/src/io_vtk.h	2008-12-17 10:31:54 UTC (rev 13714)
@@ -68,12 +68,14 @@
 
 std::string vtk_datatype_name(int datatype);
 
+std::string vtk_cellname(int cellType);
+
+int vtk_celldim(int cellType);
+
 vtkDataSetReader* vtk_read_legacy(const char *filename, vtkGridType& gridType);
 
 vtkXMLReader* vtk_read_xml(const char *filename, vtkGridType& gridType);
 
-int vtk_celldim(int cellType);
-
 template <typename T>
 int vtk_read_pointdata(vtkDataSet* dataset, const char *loc, T** data, int *num, int *dim)
 {