X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMDS%2FSMDSAbs_ElementType.hxx;h=491f4f0681a51b1efe00af773b0bb3bbaf9aaa96;hb=204a3246f4d94d4375bdac7391bec2b3ab49e0d9;hp=e66bbff09497b844b1ab2051919bd74f67f056df;hpb=bd4e115a78b52e3fbc016e5e30bb0e19b2a9e7d6;p=modules%2Fsmesh.git diff --git a/src/SMDS/SMDSAbs_ElementType.hxx b/src/SMDS/SMDSAbs_ElementType.hxx index e66bbff09..491f4f068 100644 --- a/src/SMDS/SMDSAbs_ElementType.hxx +++ b/src/SMDS/SMDSAbs_ElementType.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -6,7 +6,7 @@ // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either -// version 2.1 of the License. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -74,8 +74,7 @@ enum SMDSAbs_ElementOrder { }; /*! - * Enumeration of entity type uses in mesh info array, - * and should be synchronised with enum in SMDS + * Enumeration of entity type used in mesh info array */ enum SMDSAbs_EntityType { SMDSEntity_Node, @@ -84,6 +83,7 @@ enum SMDSAbs_EntityType { SMDSEntity_Quad_Edge, SMDSEntity_Triangle, SMDSEntity_Quad_Triangle, + SMDSEntity_BiQuad_Triangle, SMDSEntity_Quadrangle, SMDSEntity_Quad_Quadrangle, SMDSEntity_BiQuad_Quadrangle, @@ -98,6 +98,7 @@ enum SMDSAbs_EntityType { SMDSEntity_TriQuad_Hexa, SMDSEntity_Penta, SMDSEntity_Quad_Penta, + SMDSEntity_BiQuad_Penta, SMDSEntity_Hexagonal_Prism, SMDSEntity_Polyhedra, SMDSEntity_Quad_Polyhedra,