0021347: [CEA 497] Visualisation into SMESH and VISU of hexagonal prism cells (MED_OC...

[modules/smesh.git] / src / SMDS / SMDS_MeshElementIDFactory.cxx

diff --git a/src/SMDS/SMDS_MeshElementIDFactory.cxx b/src/SMDS/SMDS_MeshElementIDFactory.cxx
index 7a656c195871464b8a31de2697b44b6c14a41f78..fad6622b048f33238a79b94a3d107938466020d5 100644 (file)
--- a/src/SMDS/SMDS_MeshElementIDFactory.cxx
+++ b/src/SMDS/SMDS_MeshElementIDFactory.cxx
@@ -38,6 +38,8 @@
 #include "SMDS_UnstructuredGrid.hxx"
 #include <vtkCellType.h>
 
+#include <climits>
+
 using namespace std;
 
 //=======================================================================
@@ -47,34 +49,6 @@ using namespace std;
 SMDS_MeshElementIDFactory::SMDS_MeshElementIDFactory():
   SMDS_MeshNodeIDFactory()
 {
-//    myIDElements.clear();
-//    myVtkIndex.clear();
-    myVtkCellTypes.clear();
-    myVtkCellTypes.reserve(SMDSEntity_Last);
-    myVtkCellTypes[SMDSEntity_Node]            = VTK_VERTEX;
-    myVtkCellTypes[SMDSEntity_0D]              = VTK_VERTEX;
-    myVtkCellTypes[SMDSEntity_Edge]            = VTK_LINE;
-    myVtkCellTypes[SMDSEntity_Quad_Edge]       = VTK_QUADRATIC_EDGE;
-    myVtkCellTypes[SMDSEntity_Triangle]        = VTK_TRIANGLE;
-    myVtkCellTypes[SMDSEntity_Quad_Triangle]   = VTK_QUADRATIC_TRIANGLE;
-    myVtkCellTypes[SMDSEntity_Quadrangle]      = VTK_QUAD;
-    myVtkCellTypes[SMDSEntity_Quad_Quadrangle] = VTK_QUADRATIC_TRIANGLE;
-    myVtkCellTypes[SMDSEntity_Polygon]         = VTK_POLYGON;
-    myVtkCellTypes[SMDSEntity_Quad_Polygon]    = VTK_POLYGON; // -PR- verifer
-    myVtkCellTypes[SMDSEntity_Tetra]           = VTK_TETRA;
-    myVtkCellTypes[SMDSEntity_Quad_Tetra]      = VTK_QUADRATIC_TETRA;
-    myVtkCellTypes[SMDSEntity_Pyramid]         = VTK_PYRAMID;
-    myVtkCellTypes[SMDSEntity_Quad_Pyramid]    = VTK_CONVEX_POINT_SET;
-    myVtkCellTypes[SMDSEntity_Hexa]            = VTK_HEXAHEDRON;
-    myVtkCellTypes[SMDSEntity_Quad_Hexa]       = VTK_QUADRATIC_HEXAHEDRON;
-    myVtkCellTypes[SMDSEntity_Penta]           = VTK_WEDGE;
-    myVtkCellTypes[SMDSEntity_Quad_Penta]      = VTK_QUADRATIC_WEDGE;
-//#ifdef VTK_HAVE_POLYHEDRON
-    myVtkCellTypes[SMDSEntity_Polyhedra]       = VTK_POLYHEDRON;
-//#else
-//    myVtkCellTypes[SMDSEntity_Polyhedra]       = VTK_CONVEX_POINT_SET;
-//#endif
-    myVtkCellTypes[SMDSEntity_Quad_Polyhedra]  = VTK_CONVEX_POINT_SET;
 }
 
 int SMDS_MeshElementIDFactory::SetInVtkGrid(SMDS_MeshElement * elem)
@@ -173,7 +147,7 @@ void SMDS_MeshElementIDFactory::ReleaseID(int ID, int vtkId)
 
 void SMDS_MeshElementIDFactory::updateMinMax() const
 {
-  myMin = IntegerLast();
+  myMin = INT_MAX;
   myMax = 0;
   for (int i = 0; i < myMesh->myCells.size(); i++)
     {
@@ -186,7 +160,7 @@ void SMDS_MeshElementIDFactory::updateMinMax() const
             myMin = id;
         }
     }
-  if (myMin == IntegerLast())
+  if (myMin == INT_MAX)
     myMin = 0;
 }
 
@@ -207,9 +181,3 @@ void SMDS_MeshElementIDFactory::Clear()
   myMin = myMax = 0;
   SMDS_MeshIDFactory::Clear();
 }
-
-int SMDS_MeshElementIDFactory::GetVtkCellType(int SMDSType)
-{
-    assert((SMDSType >=0) && (SMDSType< SMDSEntity_Last));
-    return myVtkCellTypes[SMDSType];
-}