X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMDS%2FSMDS_VolumeOfNodes.cxx;h=cd893f484a87e45a70059e678810ce358bb25271;hb=bbfbac1990b2cf41334d48f3b15e656f9b2f5aea;hp=f09fa620aa2d8575a5ef6ef2822d98588233564f;hpb=8d51808a8fa523dc3a98e8eeebea02a28b112f82;p=modules%2Fsmesh.git

diff --git a/src/SMDS/SMDS_VolumeOfNodes.cxx b/src/SMDS/SMDS_VolumeOfNodes.cxx
index f09fa620a..cd893f484 100644
--- a/src/SMDS/SMDS_VolumeOfNodes.cxx
+++ b/src/SMDS/SMDS_VolumeOfNodes.cxx
@@ -19,24 +19,32 @@
 // 
 //  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
 /// 5,1 and 7,3 are an edges.
 ///////////////////////////////////////////////////////////////////////////////
 SMDS_VolumeOfNodes::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,
+		const SMDS_MeshNode * node5,
+		const SMDS_MeshNode * node6,
+		const SMDS_MeshNode * node7,
+		const SMDS_MeshNode * node8)
 {
+	myNbNodes = 8;
+	myNodes = new const SMDS_MeshNode* [myNbNodes];
 	myNodes[0]=node1;
 	myNodes[1]=node2;
 	myNodes[2]=node3;
@@ -47,6 +55,77 @@ SMDS_VolumeOfNodes::SMDS_VolumeOfNodes(
 	myNodes[7]=node8;
 }
 
+SMDS_VolumeOfNodes::SMDS_VolumeOfNodes(
+		const SMDS_MeshNode * node1,
+		const SMDS_MeshNode * node2,
+		const SMDS_MeshNode * node3,
+		const SMDS_MeshNode * node4)
+{
+	myNbNodes = 4;
+	myNodes = new const SMDS_MeshNode* [myNbNodes];
+	myNodes[0]=node1;
+	myNodes[1]=node2;
+	myNodes[2]=node3;
+	myNodes[3]=node4;
+}
+
+SMDS_VolumeOfNodes::SMDS_VolumeOfNodes(
+		const SMDS_MeshNode * node1,
+		const SMDS_MeshNode * node2,
+		const SMDS_MeshNode * node3,
+		const SMDS_MeshNode * node4,
+		const SMDS_MeshNode * node5)
+{
+	myNbNodes = 5;
+	myNodes = new const SMDS_MeshNode* [myNbNodes];
+	myNodes[0]=node1;
+	myNodes[1]=node2;
+	myNodes[2]=node3;
+	myNodes[3]=node4;
+	myNodes[4]=node5;
+}
+
+SMDS_VolumeOfNodes::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)
+{
+	myNbNodes = 6;
+	myNodes = new const SMDS_MeshNode* [myNbNodes];
+	myNodes[0]=node1;
+	myNodes[1]=node2;
+	myNodes[2]=node3;
+	myNodes[3]=node4;
+	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  : 
@@ -56,54 +135,75 @@ void SMDS_VolumeOfNodes::Print(ostream & OS) const
 {
 	OS << "volume <" << GetID() << "> : ";
 	int i;
-	for (i = 0; i < 7; ++i) OS << myNodes[i] << ",";
-	OS << myNodes[7]<< ") " << endl;
+	for (i = 0; i < NbNodes(); ++i) OS << myNodes[i] << ",";
+	OS << myNodes[NbNodes()-1]<< ") " << endl;
 }
 
 int SMDS_VolumeOfNodes::NbFaces() const
 {
-	return 6;
+	switch(NbNodes())
+	{
+	case 4: return 4;
+	case 5: return 5;
+	case 6: return 5;
+	case 8: return 6;
+	default: MESSAGE("invalid number of nodes");
+	}
+        return 0;
 }
 
 int SMDS_VolumeOfNodes::NbNodes() const
 {
-	return 8;
+	return myNbNodes;
 }
 
 int SMDS_VolumeOfNodes::NbEdges() const
 {
-	return 12;
+	switch(NbNodes())
+	{
+	case 4: return 6;
+	case 5: return 8;
+	case 6: return 9;
+	case 8: return 12;
+	default: MESSAGE("invalid number of nodes");
+	}
+        return 0;
 }
 
-SMDS_Iterator<const SMDS_MeshElement *> * SMDS_VolumeOfNodes::
+class SMDS_VolumeOfNodes_MyIterator:public SMDS_ElemIterator
+{
+  const SMDS_MeshNode* const* mySet;
+  int myLength;
+  int index;
+ public:
+  SMDS_VolumeOfNodes_MyIterator(const SMDS_MeshNode* const* s, int l):
+    mySet(s),myLength(l),index(0) {}
+
+  bool more()
+  {
+    return index<myLength;
+  }
+
+  const SMDS_MeshElement* next()
+  {
+    index++;
+    return mySet[index-1];
+  }
+};
+
+SMDS_ElemIteratorPtr SMDS_VolumeOfNodes::
 	elementsIterator(SMDSAbs_ElementType type) const
 {
-	class MyIterator:public SMDS_Iterator<const SMDS_MeshElement*>
-	{
-		const SMDS_MeshNode * const* mySet;
-		int index;
-	  public:
-		MyIterator(const SMDS_MeshNode * const* s):mySet(s),index(0)
-		{}
-
-		bool more()
-		{
-			return index<8;
-		}
-
-		const SMDS_MeshElement* next()
-		{
-			index++;
-			return mySet[index-1];
-		}	
-	};
-
-	switch(type)
-	{
-	case SMDSAbs_Volume:return SMDS_MeshElement::elementsIterator(SMDSAbs_Volume);
-	case SMDSAbs_Node:return new MyIterator(myNodes);
-	default: MESSAGE("ERROR : Iterator not implemented");
-	}
+  switch(type)
+  {
+  case SMDSAbs_Volume:
+    return SMDS_MeshElement::elementsIterator(SMDSAbs_Volume);
+  case SMDSAbs_Node:
+    return SMDS_ElemIteratorPtr(new SMDS_VolumeOfNodes_MyIterator(myNodes,myNbNodes));
+  default:
+    MESSAGE("ERROR : Iterator not implemented");
+    return SMDS_ElemIteratorPtr((SMDS_ElemIterator*)NULL);
+  }
 }
 
 SMDSAbs_ElementType SMDS_VolumeOfNodes::GetType() const