X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMDS%2FSMDS_VolumeOfFaces.hxx;h=103b919a0f516a28e0bc48ee4c5562e6b0bf4657;hp=ed5efc9c929eea7c1cc6f7b73596208f2d4c0316;hb=04f997252152407f9180e03f0af428ab2ca6f4be;hpb=8d51808a8fa523dc3a98e8eeebea02a28b112f82

diff --git a/src/SMDS/SMDS_VolumeOfFaces.hxx b/src/SMDS/SMDS_VolumeOfFaces.hxx
index ed5efc9c9..103b919a0 100644
--- a/src/SMDS/SMDS_VolumeOfFaces.hxx
+++ b/src/SMDS/SMDS_VolumeOfFaces.hxx
@@ -1,59 +1,71 @@
-//  SMESH SMDS : implementaion of Salome mesh data structure
+// Copyright (C) 2007-2016  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
 //
-//  File   : SMDS_MeshVolume.hxx
-//  Module : SMESH
 
+//  SMESH SMDS : implementation of Salome mesh data structure
+//  File   : SMDS_VolumeOfFaces.hxx
+//  Module : SMESH
+//
 #ifndef _SMDS_VolumeOfFaces_HeaderFile
 #define _SMDS_VolumeOfFaces_HeaderFile
 
+#include "SMESH_SMDS.hxx"
+
 #include "SMDS_MeshVolume.hxx"
 #include "SMDS_MeshFace.hxx"
 #include "SMDS_Iterator.hxx"
-#include <vector>
-#include <ostream>
-using namespace std;
+#include <iostream>
+
 
-class SMDS_VolumeOfFaces:public SMDS_MeshVolume
+class SMDS_EXPORT SMDS_VolumeOfFaces:public SMDS_MeshVolume
 {
-	
+        
   public:
-	SMDS_VolumeOfFaces(SMDS_MeshFace * face1, SMDS_MeshFace * face2,
-		SMDS_MeshFace * face3, SMDS_MeshFace * face4);
-	SMDS_VolumeOfFaces(SMDS_MeshFace * face1, SMDS_MeshFace * face2,
-		SMDS_MeshFace * face3, SMDS_MeshFace * face4,
-		SMDS_MeshFace * face5);
-	SMDS_VolumeOfFaces(SMDS_MeshFace * face1, SMDS_MeshFace * face2,
-		SMDS_MeshFace * face3, SMDS_MeshFace * face4,
-		SMDS_MeshFace * face5,SMDS_MeshFace * face6);
-
-	void Print(ostream & OS) const;
-	
-	int NbFaces() const;
+        SMDS_VolumeOfFaces(const SMDS_MeshFace * face1,
+                           const SMDS_MeshFace * face2,
+                           const SMDS_MeshFace * face3,
+                           const SMDS_MeshFace * face4);
+        SMDS_VolumeOfFaces(const SMDS_MeshFace * face1,
+                           const SMDS_MeshFace * face2,
+                           const SMDS_MeshFace * face3,
+                           const SMDS_MeshFace * face4,
+                           const SMDS_MeshFace * face5);
+        SMDS_VolumeOfFaces(const SMDS_MeshFace * face1,
+                           const SMDS_MeshFace * face2,
+                           const SMDS_MeshFace * face3,
+                           const SMDS_MeshFace * face4,
+                           const SMDS_MeshFace * face5,
+                           const SMDS_MeshFace * face6);
+
+        virtual SMDSAbs_EntityType GetEntityType() const;
+        virtual SMDSAbs_GeometryType GetGeomType() const;
+        virtual bool ChangeNodes(const SMDS_MeshNode* nodes[],
+                                 const int            nbNodes) {return false;}
+        virtual void Print(std::ostream & OS) const;
+
+        virtual int NbFaces() const;
 
   protected:
-	SMDS_Iterator<const SMDS_MeshElement *> *
-		elementsIterator(SMDSAbs_ElementType type) const;
-	vector<SMDS_MeshFace *> myFaces;
+        virtual SMDS_ElemIteratorPtr elementsIterator(SMDSAbs_ElementType type) const;
+        const SMDS_MeshFace * myFaces[6];
+        int                   myNbFaces;
 };
 #endif