Join modifications from BR_Dev_For_4_0 tag V4_1_1.

[modules/smesh.git] / src / SMDS / SMDS_VolumeOfNodes.hxx

diff --git a/src/SMDS/SMDS_VolumeOfNodes.hxx b/src/SMDS/SMDS_VolumeOfNodes.hxx
index 224067341f38624d8392af22830ecf95805105e3..6c18c170f14b471798a8aae89dd21ffdd93a79ba 100644 (file)
--- a/src/SMDS/SMDS_VolumeOfNodes.hxx
+++ b/src/SMDS/SMDS_VolumeOfNodes.hxx
@@ -17,7 +17,7 @@
 //  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 
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 //
@@ -27,30 +27,64 @@
 #ifndef _SMDS_VolumeOfNodes_HeaderFile
 #define _SMDS_VolumeOfNodes_HeaderFile
 
+#include "SMESH_SMDS.hxx"
+
 #include "SMDS_MeshVolume.hxx"
 
-class SMDS_VolumeOfNodes:public SMDS_MeshVolume
+class SMDS_EXPORT SMDS_VolumeOfNodes:public SMDS_MeshVolume
 {
        
   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);
+               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(ostream & OS) const;
+       void Print(std::ostream & OS) const;
        int NbFaces() const;
        int NbNodes() const;
        int NbEdges() const;
        SMDSAbs_ElementType GetType() const;    
+
+  /*!
+   * \brief Return node by its index
+    * \param ind - node index
+    * \retval const SMDS_MeshNode* - the node
+   * 
+   * Index is wrapped if it is out of a valid range
+   */
+  virtual const SMDS_MeshNode* GetNode(const int ind) const;
+
   protected:
-       SMDS_Iterator<const SMDS_MeshElement *> *
+       SMDS_ElemIteratorPtr
                elementsIterator(SMDSAbs_ElementType type) const;
-       SMDS_MeshNode * myNodes[8];
+       const SMDS_MeshNode** myNodes;
+       int                   myNbNodes;
 };
 #endif