X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FSMDS%2FSMDS_MeshFace.hxx;h=11e1f32c6ca606ff00858dabe0d93036c8c7eca0;hb=67312ab966a7c21fe835917978028643ffadd99e;hp=15e06572a3184efe9d3bc8f42bdf7eb2f6a9d0de;hpb=bd4e115a78b52e3fbc016e5e30bb0e19b2a9e7d6;p=modules%2Fsmesh.git

diff --git a/src/SMDS/SMDS_MeshFace.hxx b/src/SMDS/SMDS_MeshFace.hxx
index 15e06572a..11e1f32c6 100644
--- a/src/SMDS/SMDS_MeshFace.hxx
+++ b/src/SMDS/SMDS_MeshFace.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
@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//  SMESH SMDS : implementaion of Salome mesh data structure
+//  SMESH SMDS : implementation of Salome mesh data structure
 //  File   : SMDS_MeshFace.hxx
 //  Module : SMESH
 //
@@ -31,11 +31,37 @@
 
 #include "SMDS_MeshCell.hxx"
 
-class SMDS_EXPORT SMDS_MeshFace:public SMDS_MeshCell
+#include "Utils_SALOME_Exception.hxx"
+
+/*!
+ * \brief Mesh face. This type is not allocated.
+ *        It is only used as function argument type to provide more clear semantic.
+ */
+class SMDS_EXPORT SMDS_MeshFace : public SMDS_MeshCell
 {
-  public:
-        SMDSAbs_ElementType GetType() const;
-        virtual vtkIdType GetVtkType() const;
+  void init( const std::vector<vtkIdType>& vtkNodeIds )
+  {
+    SMDSAbs_EntityType entity = SMDSEntity_Triangle;
+    switch ( vtkNodeIds.size())
+    {
+    case 3: entity = SMDSEntity_Triangle;          break;
+    case 4: entity = SMDSEntity_Quadrangle;        break;
+    case 6: entity = SMDSEntity_Quad_Triangle;     break;
+    case 8: entity = SMDSEntity_Quad_Quadrangle;   break;
+    case 7: entity = SMDSEntity_BiQuad_Triangle;   break;
+    case 9: entity = SMDSEntity_BiQuad_Quadrangle; break;
+    default: throw SALOME_Exception("wrong face nodes");
+    }
+    SMDS_MeshCell::init( entity, vtkNodeIds );
+  }
+
+  friend class SMDS_Mesh;
+
+ public:
+
+  virtual SMDSAbs_ElementType GetType() const { return SMDSAbs_Face; }
+
+  static SMDSAbs_ElementType Type() { return SMDSAbs_Face; }
 };
 
 #endif