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

diff --git a/src/SMDS/SMDS_FaceOfEdges.cxx b/src/SMDS/SMDS_FaceOfEdges.cxx
index 0e9243d3f..5b5483022 100644
--- a/src/SMDS/SMDS_FaceOfEdges.cxx
+++ b/src/SMDS/SMDS_FaceOfEdges.cxx
@@ -1,28 +1,36 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 //  SMESH SMDS : implementaion of Salome mesh data structure
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-// 
-//  This library is free software; you can redistribute it and/or 
-//  modify it under the terms of the GNU Lesser General Public 
-//  License as published by the Free Software Foundation; either 
-//  version 2.1 of the License. 
-// 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-//  Lesser General Public License for more details. 
-// 
-//  You should have received a copy of the GNU Lesser General Public 
-//  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 
+#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 +38,7 @@
 
 int SMDS_FaceOfEdges::NbEdges() const
 {
-	return myEdges.size();
+	return myNbEdges;
 }
 
 int SMDS_FaceOfEdges::NbFaces() const
@@ -55,50 +63,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 +132,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();
@@ -133,3 +157,29 @@ SMDS_FaceOfEdges::SMDS_FaceOfEdges(SMDS_MeshEdge* edge1, SMDS_MeshEdge* edge2,
 
 }*/
 
+
+int SMDS_FaceOfEdges::NbNodes() const
+{
+  return myEdges[0]->NbNodes() + myEdges[1]->NbNodes() + myEdges[2]->NbNodes() +
+    ( myNbEdges == 4 ? myEdges[3]->NbNodes() : 0 ) - myNbEdges;
+}
+
+/*!
+ * \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
+ */
+const SMDS_MeshNode* SMDS_FaceOfEdges::GetNode(const int ind) const
+{
+  int index = WrappedIndex( ind );
+  for ( int i = 0; i < myNbEdges; ++i ) {
+    if ( index >= myEdges[ i ]->NbNodes() )
+      index -= myEdges[ i ]->NbNodes();
+    else
+      return myEdges[ i ]->GetNode( index );
+  }
+  return 0;
+}
+