X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMDS%2FSMDS_VolumeOfNodes.cxx;h=cd893f484a87e45a70059e678810ce358bb25271;hb=423f097f5e34c955b122291ad657d8ac49d8aae0;hp=3f4d6a2458504f08aff7938b0b1bd17b779d8d9c;hpb=c3bf92bd87b770fd81631a3853f7f5bb1ac6a4e8;p=modules%2Fsmesh.git

diff --git a/src/SMDS/SMDS_VolumeOfNodes.cxx b/src/SMDS/SMDS_VolumeOfNodes.cxx
index 3f4d6a245..cd893f484 100644
--- a/src/SMDS/SMDS_VolumeOfNodes.cxx
+++ b/src/SMDS/SMDS_VolumeOfNodes.cxx
@@ -19,9 +19,15 @@
 // 
 //  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
 
-#include "utilities.h"
+#ifdef _MSC_VER
+#pragma warning(disable:4786)
+#endif
+
 #include "SMDS_VolumeOfNodes.hxx"
 #include "SMDS_MeshNode.hxx"
+#include "utilities.h"
+
+using namespace std;
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Create an hexahedron. node 1,2,3,4 and 5,6,7,8 are quadrangle and
@@ -37,7 +43,8 @@ SMDS_VolumeOfNodes::SMDS_VolumeOfNodes(
 		const SMDS_MeshNode * node7,
 		const SMDS_MeshNode * node8)
 {
-	myNodes.resize(8);
+	myNbNodes = 8;
+	myNodes = new const SMDS_MeshNode* [myNbNodes];
 	myNodes[0]=node1;
 	myNodes[1]=node2;
 	myNodes[2]=node3;
@@ -54,7 +61,8 @@ SMDS_VolumeOfNodes::SMDS_VolumeOfNodes(
 		const SMDS_MeshNode * node3,
 		const SMDS_MeshNode * node4)
 {
-	myNodes.resize(4);
+	myNbNodes = 4;
+	myNodes = new const SMDS_MeshNode* [myNbNodes];
 	myNodes[0]=node1;
 	myNodes[1]=node2;
 	myNodes[2]=node3;
@@ -68,7 +76,8 @@ SMDS_VolumeOfNodes::SMDS_VolumeOfNodes(
 		const SMDS_MeshNode * node4,
 		const SMDS_MeshNode * node5)
 {
-	myNodes.resize(5);
+	myNbNodes = 5;
+	myNodes = new const SMDS_MeshNode* [myNbNodes];
 	myNodes[0]=node1;
 	myNodes[1]=node2;
 	myNodes[2]=node3;
@@ -84,7 +93,8 @@ SMDS_VolumeOfNodes::SMDS_VolumeOfNodes(
 		const SMDS_MeshNode * node5,
 		const SMDS_MeshNode * node6)
 {
-	myNodes.resize(6);
+	myNbNodes = 6;
+	myNodes = new const SMDS_MeshNode* [myNbNodes];
 	myNodes[0]=node1;
 	myNodes[1]=node2;
 	myNodes[2]=node3;
@@ -92,6 +102,30 @@ SMDS_VolumeOfNodes::SMDS_VolumeOfNodes(
 	myNodes[4]=node5;
 	myNodes[5]=node6;
 }
+
+bool SMDS_VolumeOfNodes::ChangeNodes(const SMDS_MeshNode* nodes[],
+                                     const int            nbNodes)
+{
+  if (nbNodes < 4 || nbNodes > 8 || nbNodes == 7)
+    return false;
+
+  delete [] myNodes;
+  myNbNodes = nbNodes;
+  myNodes = new const SMDS_MeshNode* [myNbNodes];
+  for ( int i = 0; i < nbNodes; i++ )
+    myNodes[ i ] = nodes [ i ];
+
+  return true;
+}
+
+SMDS_VolumeOfNodes::~SMDS_VolumeOfNodes()
+{
+  if (myNodes != NULL) {
+    delete [] myNodes;
+    myNodes = NULL;
+  }
+}
+
 //=======================================================================
 //function : Print
 //purpose  : 
@@ -115,11 +149,12 @@ int SMDS_VolumeOfNodes::NbFaces() const
 	case 8: return 6;
 	default: MESSAGE("invalid number of nodes");
 	}
+        return 0;
 }
 
 int SMDS_VolumeOfNodes::NbNodes() const
 {
-	return myNodes.size();
+	return myNbNodes;
 }
 
 int SMDS_VolumeOfNodes::NbEdges() const
@@ -132,19 +167,21 @@ int SMDS_VolumeOfNodes::NbEdges() const
 	case 8: return 12;
 	default: MESSAGE("invalid number of nodes");
 	}
+        return 0;
 }
 
 class SMDS_VolumeOfNodes_MyIterator:public SMDS_ElemIterator
 {
-  const vector<const SMDS_MeshNode*>& mySet;
+  const SMDS_MeshNode* const* mySet;
+  int myLength;
   int index;
  public:
-  SMDS_VolumeOfNodes_MyIterator(const vector<const SMDS_MeshNode*>& s):
-    mySet(s),index(0) {}
+  SMDS_VolumeOfNodes_MyIterator(const SMDS_MeshNode* const* s, int l):
+    mySet(s),myLength(l),index(0) {}
 
   bool more()
   {
-    return index<mySet.size();
+    return index<myLength;
   }
 
   const SMDS_MeshElement* next()
@@ -162,7 +199,7 @@ SMDS_ElemIteratorPtr SMDS_VolumeOfNodes::
   case SMDSAbs_Volume:
     return SMDS_MeshElement::elementsIterator(SMDSAbs_Volume);
   case SMDSAbs_Node:
-    return SMDS_ElemIteratorPtr(new SMDS_VolumeOfNodes_MyIterator(myNodes));
+    return SMDS_ElemIteratorPtr(new SMDS_VolumeOfNodes_MyIterator(myNodes,myNbNodes));
   default:
     MESSAGE("ERROR : Iterator not implemented");
     return SMDS_ElemIteratorPtr((SMDS_ElemIterator*)NULL);