X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMDS%2FSMDS_FaceOfEdges.cxx;h=640c55d30194f44cd2835f4164abfaed5bc93a3b;hp=0e9243d3f4cb5faceb595027bca872aed447bbe2;hb=2387bfa403855b82751bf9f122295b1fc6923a18;hpb=8d51808a8fa523dc3a98e8eeebea02a28b112f82

diff --git a/src/SMDS/SMDS_FaceOfEdges.cxx b/src/SMDS/SMDS_FaceOfEdges.cxx
index 0e9243d3f..640c55d30 100644
--- a/src/SMDS/SMDS_FaceOfEdges.cxx
+++ b/src/SMDS/SMDS_FaceOfEdges.cxx
@@ -19,10 +19,16 @@
 // 
 //  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
 
+#ifdef _MSC_VER
+#pragma warning(disable:4786)
+#endif
+
 #include "SMDS_FaceOfEdges.hxx"
 #include "SMDS_IteratorOfElements.hxx"
 #include "SMDS_MeshNode.hxx"
 
+using namespace std;
+
 //=======================================================================
 //function : NbEdges
 //purpose  : 
@@ -30,7 +36,7 @@
 
 int SMDS_FaceOfEdges::NbEdges() const
 {
-	return myEdges.size();
+	return myNbEdges;
 }
 
 int SMDS_FaceOfEdges::NbFaces() const
@@ -55,50 +61,66 @@ SMDSAbs_ElementType SMDS_FaceOfEdges::GetType() const
 	return SMDSAbs_Face;
 }
 
-SMDS_Iterator<const SMDS_MeshElement *> * SMDS_FaceOfEdges::
-	elementsIterator(SMDSAbs_ElementType type) const
+//=======================================================================
+//function : elementsIterator
+//purpose  : 
+//=======================================================================
+
+class SMDS_FaceOfEdges_MyIterator:public SMDS_ElemIterator
 {
-	class MyIterator:public SMDS_Iterator<const SMDS_MeshElement*>
-	{
-		const vector<const SMDS_MeshEdge*>& mySet;
-		int index;
-	  public:
-		MyIterator(const vector<const SMDS_MeshEdge*>& 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_Edge:return new MyIterator(myEdges);
-	default:return new SMDS_IteratorOfElements(this,type,new MyIterator(myEdges));
-	}
+  const SMDS_MeshEdge* const *mySet;
+  int myLength;
+  int index;
+ public:
+  SMDS_FaceOfEdges_MyIterator(const SMDS_MeshEdge* 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_FaceOfEdges::elementsIterator
+                         (SMDSAbs_ElementType type) const
+{
+  switch(type)
+  {
+  case SMDSAbs_Face:
+    return SMDS_MeshElement::elementsIterator(SMDSAbs_Face);
+  case SMDSAbs_Edge:
+    return SMDS_ElemIteratorPtr(new SMDS_FaceOfEdges_MyIterator(myEdges,myNbEdges));
+  default:
+    return SMDS_ElemIteratorPtr
+      (new SMDS_IteratorOfElements
+       (this,type, SMDS_ElemIteratorPtr
+        (new SMDS_FaceOfEdges_MyIterator(myEdges,myNbEdges))));
+  }
 }
 
-SMDS_FaceOfEdges::SMDS_FaceOfEdges(SMDS_MeshEdge* edge1, SMDS_MeshEdge* edge2,
-	SMDS_MeshEdge* edge3)
+SMDS_FaceOfEdges::SMDS_FaceOfEdges(const SMDS_MeshEdge* edge1,
+                                   const SMDS_MeshEdge* edge2,
+                                   const SMDS_MeshEdge* edge3)
 {
-	myEdges.resize(3);
+	myNbEdges = 3;
 	myEdges[0]=edge1;
 	myEdges[1]=edge2;
 	myEdges[2]=edge3;
+	myEdges[3]=0;
 }
 
-SMDS_FaceOfEdges::SMDS_FaceOfEdges(SMDS_MeshEdge* edge1, SMDS_MeshEdge* edge2,
-	SMDS_MeshEdge* edge3, SMDS_MeshEdge* edge4)
+SMDS_FaceOfEdges::SMDS_FaceOfEdges(const SMDS_MeshEdge* edge1,
+                                   const SMDS_MeshEdge* edge2,
+                                   const SMDS_MeshEdge* edge3,
+                                   const SMDS_MeshEdge* edge4)
 {
-	myEdges.resize(4);
+	myNbEdges = 4;
 	myEdges[0]=edge1;
 	myEdges[1]=edge2;
 	myEdges[2]=edge3;
@@ -108,7 +130,7 @@ SMDS_FaceOfEdges::SMDS_FaceOfEdges(SMDS_MeshEdge* edge1, SMDS_MeshEdge* edge2,
 /*bool operator<(const SMDS_FaceOfEdges& f1, const SMDS_FaceOfEdges& f2)
 {
 	set<SMDS_MeshNode> set1,set2;
-	SMDS_Iterator<const SMDS_MeshElement*> * it;
+	SMDS_ElemIteratorPtr it;
 	const SMDS_MeshNode * n;
 
 	it=f1.nodesIterator();