From 27c31e5d2a81ccf7778f8a97d6357f352dccbeb0 Mon Sep 17 00:00:00 2001 From: eap Date: Wed, 15 Sep 2010 15:08:58 +0000 Subject: [PATCH] 0020982: EDF 1547 SMESH: Creation of non-conformal quadratic pyramids Replace VTK_CONVEX_POINT_SET with VTK_QUADRATIC_PYRAMID --- src/OBJECT/SMESH_Actor.cxx | 2 ++ src/OBJECT/SMESH_Object.cxx | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/OBJECT/SMESH_Actor.cxx b/src/OBJECT/SMESH_Actor.cxx index 33acca122..38dddb2ae 100644 --- a/src/OBJECT/SMESH_Actor.cxx +++ b/src/OBJECT/SMESH_Actor.cxx @@ -196,6 +196,7 @@ SMESH_ActorDef::SMESH_ActorDef() aFilter->RegisterCellsWithType(VTK_QUADRATIC_TETRA); aFilter->RegisterCellsWithType(VTK_QUADRATIC_HEXAHEDRON); aFilter->RegisterCellsWithType(VTK_QUADRATIC_WEDGE); + aFilter->RegisterCellsWithType(VTK_QUADRATIC_PYRAMID); aFilter->RegisterCellsWithType(VTK_CONVEX_POINT_SET); //Definition 1D device of the actor @@ -1346,6 +1347,7 @@ void SMESH_ActorDef::SetEntityMode(unsigned int theMode) aHightFilter->RegisterCellsWithType(VTK_QUADRATIC_TETRA); aHightFilter->RegisterCellsWithType(VTK_QUADRATIC_HEXAHEDRON); aHightFilter->RegisterCellsWithType(VTK_QUADRATIC_WEDGE); + aHightFilter->RegisterCellsWithType(VTK_QUADRATIC_PYRAMID); aHightFilter->RegisterCellsWithType(VTK_CONVEX_POINT_SET); } aFilter->Update(); diff --git a/src/OBJECT/SMESH_Object.cxx b/src/OBJECT/SMESH_Object.cxx index eb43a6b5f..480a0fe3f 100644 --- a/src/OBJECT/SMESH_Object.cxx +++ b/src/OBJECT/SMESH_Object.cxx @@ -119,7 +119,7 @@ static inline vtkIdType getCellType( const SMDSAbs_ElementType theType, return VTK_QUADRATIC_WEDGE; } else if ( theNbNodes==13 ) { - return VTK_CONVEX_POINT_SET; + return VTK_QUADRATIC_PYRAMID; //VTK_CONVEX_POINT_SET; } else return VTK_EMPTY_CELL; -- 2.39.2