X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMDS%2FSMDS_VolumeOfNodes.hxx;h=15f0058c69752fa07d4a22c36b9cdb0967ae4c3f;hp=224067341f38624d8392af22830ecf95805105e3;hb=ad3cb4c93852dbc834d7075c087bbc749197454b;hpb=8d51808a8fa523dc3a98e8eeebea02a28b112f82

diff --git a/src/SMDS/SMDS_VolumeOfNodes.hxx b/src/SMDS/SMDS_VolumeOfNodes.hxx
index 224067341..15f0058c6 100644
--- a/src/SMDS/SMDS_VolumeOfNodes.hxx
+++ b/src/SMDS/SMDS_VolumeOfNodes.hxx
@@ -1,56 +1,95 @@
-//  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
+//
+
+//  SMESH SMDS : implementation of Salome mesh data structure
 //  File   : SMDS_MeshVolume.hxx
 //  Module : SMESH
-
+//
 #ifndef _SMDS_VolumeOfNodes_HeaderFile
 #define _SMDS_VolumeOfNodes_HeaderFile
 
-#include "SMDS_MeshVolume.hxx"
+#include "SMESH_SMDS.hxx"
+
+#include "SMDS_CellOfNodes.hxx"
 
-class SMDS_VolumeOfNodes:public SMDS_MeshVolume
+class SMDS_EXPORT SMDS_VolumeOfNodes: public SMDS_CellOfNodes
 {
-	
-  public:
-	SMDS_VolumeOfNodes(
-		SMDS_MeshNode * node1,
-		SMDS_MeshNode * node2,
-		SMDS_MeshNode * node3,
-		SMDS_MeshNode * node4,
-		SMDS_MeshNode * node5,
-		SMDS_MeshNode * node6,
-		SMDS_MeshNode * node7,
-		SMDS_MeshNode * node8);
-
-	void Print(ostream & OS) const;
-	int NbFaces() const;
-	int NbNodes() const;
-	int NbEdges() const;
-	SMDSAbs_ElementType GetType() const;	
-  protected:
-	SMDS_Iterator<const SMDS_MeshElement *> *
-		elementsIterator(SMDSAbs_ElementType type) const;
-	SMDS_MeshNode * myNodes[8];
+        
+ public:
+  SMDS_VolumeOfNodes(const SMDS_MeshNode * node1,
+                     const SMDS_MeshNode * node2,
+                     const SMDS_MeshNode * node3,
+                     const SMDS_MeshNode * node4);
+  SMDS_VolumeOfNodes(const SMDS_MeshNode * node1,
+                     const SMDS_MeshNode * node2,
+                     const SMDS_MeshNode * node3,
+                     const SMDS_MeshNode * node4,
+                     const SMDS_MeshNode * node5);
+  SMDS_VolumeOfNodes(const SMDS_MeshNode * node1,
+                     const SMDS_MeshNode * node2,
+                     const SMDS_MeshNode * node3,
+                     const SMDS_MeshNode * node4,
+                     const SMDS_MeshNode * node5,
+                     const SMDS_MeshNode * node6);
+  SMDS_VolumeOfNodes(const SMDS_MeshNode * node1,
+                     const SMDS_MeshNode * node2,
+                     const SMDS_MeshNode * node3,
+                     const SMDS_MeshNode * node4,
+                     const SMDS_MeshNode * node5,
+                     const SMDS_MeshNode * node6,
+                     const SMDS_MeshNode * node7,
+                     const SMDS_MeshNode * node8);
+  bool ChangeNodes(const SMDS_MeshNode* nodes[],
+                   const int            nbNodes);
+  ~SMDS_VolumeOfNodes();
+
+  void Print(std::ostream & OS) const;
+  int NbFaces() const;
+  int NbNodes() const;
+  int NbEdges() const;
+  virtual SMDSAbs_ElementType  GetType() const;    
+  virtual SMDSAbs_EntityType   GetEntityType() const;
+  virtual SMDSAbs_GeometryType GetGeomType() const;
+
+  virtual bool IsPoly() const { return false; }
+  virtual bool IsQuadratic() const { return false; }
+  /*!
+   * \brief Return node by its index
+   * \param ind - node index
+   * \retval const SMDS_MeshNode* - the node
+   */
+  virtual const SMDS_MeshNode* GetNode(const int ind) const;
+
+  virtual int  NbCornerNodes() const { return NbNodes(); }
+  virtual int  GetNodeIndex( const SMDS_MeshNode* node ) const;
+
+  virtual SMDS_ElemIteratorPtr nodesIterator() const;
+  virtual SMDS_NodeIteratorPtr nodeIterator() const;
+
+ protected:
+
+  const SMDS_MeshNode** myNodes;
+  int                   myNbNodes;
+
 };
+
 #endif