X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMDS%2FSMDS_MeshFace.hxx;h=f48b84129baa6998f202d66eebdcab6c46ae7a62;hp=5d218f9f9a9444e125f4d4d6bc03429e1f307e66;hb=499f29d24922cec66e41b41a0039a954993bc6df;hpb=007c0191337598a9431229b2d3dec7fde25d4c4e

diff --git a/src/SMDS/SMDS_MeshFace.hxx b/src/SMDS/SMDS_MeshFace.hxx
index 5d218f9f9..f48b84129 100644
--- a/src/SMDS/SMDS_MeshFace.hxx
+++ b/src/SMDS/SMDS_MeshFace.hxx
@@ -1,118 +1,67 @@
-//  SMESH SMDS : implementaion of Salome mesh data structure
+// Copyright (C) 2007-2022  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-// 
-//  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. 
-// 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-//  Lesser General Public License for more details. 
-// 
-//  You should have received a copy of the GNU Lesser General Public 
-//  License along with this library; if not, write to the Free Software 
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-// 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
+// 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, 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
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+//  SMESH SMDS : implementation of Salome mesh data structure
 //  File   : SMDS_MeshFace.hxx
 //  Module : SMESH
-
+//
 #ifndef _SMDS_MeshFace_HeaderFile
 #define _SMDS_MeshFace_HeaderFile
 
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Handle_SMDS_MeshFace_HeaderFile
-#include "Handle_SMDS_MeshFace.hxx"
-#endif
-
-#ifndef _Standard_Integer_HeaderFile
-#include <Standard_Integer.hxx>
-#endif
-#ifndef _SMDS_MeshElement_HeaderFile
-#include "SMDS_MeshElement.hxx"
-#endif
-#ifndef _Standard_OStream_HeaderFile
-#include <Standard_OStream.hxx>
-#endif
-
-
-class SMDS_MeshFace : public SMDS_MeshElement {
-
-public:
-
-    inline void* operator new(size_t,void* anAddress) 
-      {
-        return anAddress;
-      }
-    inline void* operator new(size_t size) 
-      { 
-        return Standard::Allocate(size); 
-      }
-    inline void  operator delete(void *anAddress) 
-      { 
-        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
-      }
-//    inline void  operator delete(void *anAddress, size_t size) 
-//      { 
-//        if (anAddress) Standard::Free((Standard_Address&)anAddress,size); 
-//      }
- // Methods PUBLIC
- // 
-Standard_EXPORT virtual  void ComputeKey()  = 0;
-Standard_EXPORT inline   Standard_Integer GetKey() const;
-Standard_EXPORT virtual  Standard_Integer NbEdges() const;
-Standard_EXPORT virtual  void Print(Standard_OStream& OS) const;
-Standard_EXPORT ~SMDS_MeshFace();
-
-
-
-
- // Type management
- //
- Standard_EXPORT friend Handle_Standard_Type& SMDS_MeshFace_Type_();
- Standard_EXPORT const Handle(Standard_Type)& DynamicType() const;
- Standard_EXPORT Standard_Boolean	       IsKind(const Handle(Standard_Type)&) const;
-
-protected:
-
- // Methods PROTECTED
- // 
-Standard_EXPORT SMDS_MeshFace(const Standard_Integer ID,const Standard_Integer NbConnections);
-
-
- // Fields PROTECTED
- //
-Standard_Integer myKey;
-
-
-private: 
-
- // Methods PRIVATE
- // 
-
-
- // Fields PRIVATE
- //
-
-
+#include "SMESH_SMDS.hxx"
+
+#include "SMDS_MeshCell.hxx"
+
+#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
+{
+  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; }
 };
 
-
-#include "SMDS_MeshFace.lxx"
-
-
-
-// other inline functions and methods (like "C++: function call" methods)
-//
-
-
 #endif