From 41ed515a46b58fedf64e9e04fcb0e971d337c5ab Mon Sep 17 00:00:00 2001 From: eap Date: Fri, 16 Dec 2011 09:06:23 +0000 Subject: [PATCH] 0021347: [CEA 497] Visualisation into SMESH and VISU of hexagonal prism cells (MED_OCTA12) 0021380: EDF 1937 SMESH: Take into account QUAD9 and HEXA27 - int GetVtkCellType(int SMDSType); - std::vector myVtkCellTypes; --- src/SMDS/SMDS_MeshElementIDFactory.cxx | 34 -------------------------- src/SMDS/SMDS_MeshElementIDFactory.hxx | 3 --- 2 files changed, 37 deletions(-) diff --git a/src/SMDS/SMDS_MeshElementIDFactory.cxx b/src/SMDS/SMDS_MeshElementIDFactory.cxx index 6c86e6f28..fad6622b0 100644 --- a/src/SMDS/SMDS_MeshElementIDFactory.cxx +++ b/src/SMDS/SMDS_MeshElementIDFactory.cxx @@ -49,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) @@ -209,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]; -} diff --git a/src/SMDS/SMDS_MeshElementIDFactory.hxx b/src/SMDS/SMDS_MeshElementIDFactory.hxx index a110c1ea6..6508fcc08 100644 --- a/src/SMDS/SMDS_MeshElementIDFactory.hxx +++ b/src/SMDS/SMDS_MeshElementIDFactory.hxx @@ -49,7 +49,6 @@ public: virtual void ReleaseID(int ID, int vtkId = -1); SMDS_ElemIteratorPtr elementsIterator() const; virtual void Clear(); - int GetVtkCellType(int SMDSType); protected: void updateMinMax() const; @@ -59,8 +58,6 @@ protected: if (id < myMin) myMin = id; } - std::vector myVtkCellTypes; - }; #endif -- 2.39.2