X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMDS%2FSMDS_FaceOfNodes.cxx;h=aa687082475c0633983a49b859093ecbd6b5bdca;hb=24d6fd82e6e0f8daa90e318e365226e81e7816ee;hp=9a9a945f9e4409e4708d66a4dda9de3fa6c38803;hpb=8d51808a8fa523dc3a98e8eeebea02a28b112f82;p=modules%2Fsmesh.git

diff --git a/src/SMDS/SMDS_FaceOfNodes.cxx b/src/SMDS/SMDS_FaceOfNodes.cxx
index 9a9a945f9..aa6870824 100644
--- a/src/SMDS/SMDS_FaceOfNodes.cxx
+++ b/src/SMDS/SMDS_FaceOfNodes.cxx
@@ -19,11 +19,17 @@
 // 
 //  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
 
+#ifdef _MSC_VER
+#pragma warning(disable:4786)
+#endif
+
 #include "SMDS_FaceOfNodes.hxx"
 #include "SMDS_IteratorOfElements.hxx"
 #include "SMDS_MeshNode.hxx"
 #include "utilities.h"
 
+using namespace std;
+
 //=======================================================================
 //function : NbEdges
 //purpose  : 
@@ -41,8 +47,9 @@ int SMDS_FaceOfNodes::NbFaces() const
 
 int SMDS_FaceOfNodes::NbNodes() const
 {
-	return myNodes.size();
+	return myNbNodes;
 }
+
 //=======================================================================
 //function : Print
 //purpose  : 
@@ -56,63 +63,94 @@ void SMDS_FaceOfNodes::Print(ostream & OS) const
 	OS << myNodes[i] << ") " << endl;
 }
 
-SMDS_Iterator<const SMDS_MeshElement *> * SMDS_FaceOfNodes::
-	elementsIterator(SMDSAbs_ElementType type) const
+//=======================================================================
+//function : elementsIterator
+//purpose  : 
+//=======================================================================
+
+class SMDS_FaceOfNodes_MyIterator:public SMDS_ElemIterator
 {
-	class MyIterator:public SMDS_Iterator<const SMDS_MeshElement*>
-	{
-		const vector<const SMDS_MeshNode*>& mySet;
-		int index;
-	  public:
-		MyIterator(const vector<const SMDS_MeshNode*>& s):mySet(s),index(0)
-		{}
-
-		bool more()
-		{
-			return index<mySet.size();
-		}
-
-		const SMDS_MeshElement* next()
-		{
-			index++;
-			return mySet[index-1];
-		}	
-	};
-
-	switch(type)
-	{
-	case SMDSAbs_Face:return SMDS_MeshElement::elementsIterator(SMDSAbs_Face);
-	case SMDSAbs_Node:return new MyIterator(myNodes);
-	case SMDSAbs_Edge:
-		MESSAGE("Error : edge iterator for SMDS_FaceOfNodes not implemented");
-		break;
-	default:return new SMDS_IteratorOfElements(this,type,new MyIterator(myNodes));
-	}
+  const SMDS_MeshNode* const *mySet;
+  int myLength;
+  int index;
+ public:
+  SMDS_FaceOfNodes_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_FaceOfNodes::elementsIterator
+                         (SMDSAbs_ElementType type) const
+{
+  switch(type)
+  {
+  case SMDSAbs_Face:
+    return SMDS_MeshElement::elementsIterator(SMDSAbs_Face);
+  case SMDSAbs_Node:
+    return SMDS_ElemIteratorPtr(new SMDS_FaceOfNodes_MyIterator(myNodes,myNbNodes));
+  case SMDSAbs_Edge:
+    MESSAGE("Error : edge iterator for SMDS_FaceOfNodes not implemented");
+    break;
+  default:
+    return SMDS_ElemIteratorPtr
+      (new SMDS_IteratorOfElements
+       (this,type,SMDS_ElemIteratorPtr
+        (new SMDS_FaceOfNodes_MyIterator(myNodes,myNbNodes))));
+  }
+  return SMDS_ElemIteratorPtr();
 }
 
-SMDS_FaceOfNodes::SMDS_FaceOfNodes(SMDS_MeshNode* node1, SMDS_MeshNode* node2,
-	SMDS_MeshNode* node3)
+SMDS_FaceOfNodes::SMDS_FaceOfNodes(const SMDS_MeshNode* node1,
+                                   const SMDS_MeshNode* node2,
+                                   const SMDS_MeshNode* node3)
 {
-	myNodes.resize(3);
+	myNbNodes = 3;
 	myNodes[0]=node1;
 	myNodes[1]=node2;
 	myNodes[2]=node3;
+	myNodes[3]=0;
 }
 
-SMDS_FaceOfNodes::SMDS_FaceOfNodes(SMDS_MeshNode* node1, SMDS_MeshNode* node2,
-	SMDS_MeshNode* node3, SMDS_MeshNode* node4)
+SMDS_FaceOfNodes::SMDS_FaceOfNodes(const SMDS_MeshNode* node1,
+                                   const SMDS_MeshNode* node2,
+                                   const SMDS_MeshNode* node3,
+                                   const SMDS_MeshNode* node4)
 {
-	myNodes.resize(4);
+	myNbNodes = 4;
 	myNodes[0]=node1;
 	myNodes[1]=node2;
 	myNodes[2]=node3;
 	myNodes[3]=node4;	
 }
+bool SMDS_FaceOfNodes::ChangeNodes(const SMDS_MeshNode* nodes[],
+                                   const int            nbNodes)
+{
+  myNbNodes = nbNodes;
+  myNodes[0]=nodes[0];
+  myNodes[1]=nodes[1];
+  myNodes[2]=nodes[2];
+  if (nbNodes == 4)
+    myNodes[3]=nodes[3];
+  else if (nbNodes != 3)
+    return false;
+
+  return true;
+}
 
 /*bool operator<(const SMDS_FaceOfNodes& f1, const SMDS_FaceOfNodes& f2)
 {
 	set<SMDS_MeshNode> set1,set2;
-	SMDS_Iterator<const SMDS_MeshElement*> * it;
+	SMDS_ElemIteratorPtr it;
 	const SMDS_MeshNode * n;
 
 	it=f1.nodesIterator();