X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMDS%2FSMDS_MeshElement.cxx;h=e6f84076bf2f71cf7f24deac1b7a53649e589d57;hb=ffd567ddfa3eae0e41303e5c462c3bbe66065e32;hp=701e6fe97ce20051f79820ed74110609341e86a1;hpb=00c069f8d414099a12268c42d58c6cfae9d1bff9;p=modules%2Fsmesh.git

diff --git a/src/SMDS/SMDS_MeshElement.cxx b/src/SMDS/SMDS_MeshElement.cxx
index 701e6fe97..e6f84076b 100644
--- a/src/SMDS/SMDS_MeshElement.cxx
+++ b/src/SMDS/SMDS_MeshElement.cxx
@@ -17,7 +17,11 @@
 //  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 
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+
+#ifdef _MSC_VER
+#pragma warning(disable:4786)
+#endif
 
 #include "SMDS_MeshElement.hxx"
 #include "SMDS_MeshNode.hxx"
@@ -26,6 +30,8 @@
 #include "SMDS_MeshVolume.hxx"
 #include "utilities.h"
 
+using namespace std;
+
 SMDS_MeshElement::SMDS_MeshElement(int ID):myID(ID)
 {
 }
@@ -45,7 +51,7 @@ ostream & operator <<(ostream & OS, const SMDS_MeshElement * ME)
 /// Create an iterator which iterate on nodes owned by the element.
 /// This method call elementsIterator().
 ///////////////////////////////////////////////////////////////////////////////
-SMDS_Iterator<const SMDS_MeshElement *> * SMDS_MeshElement::nodesIterator() const
+SMDS_ElemIteratorPtr SMDS_MeshElement::nodesIterator() const
 {
 	return elementsIterator(SMDSAbs_Node);
 }
@@ -54,7 +60,7 @@ SMDS_Iterator<const SMDS_MeshElement *> * SMDS_MeshElement::nodesIterator() cons
 /// Create an iterator which iterate on edges linked with or owned by the element.
 /// This method call elementsIterator().
 ///////////////////////////////////////////////////////////////////////////////
-SMDS_Iterator<const SMDS_MeshElement *> * SMDS_MeshElement::edgesIterator() const
+SMDS_ElemIteratorPtr SMDS_MeshElement::edgesIterator() const
 {
 	return elementsIterator(SMDSAbs_Edge);
 }
@@ -63,7 +69,7 @@ SMDS_Iterator<const SMDS_MeshElement *> * SMDS_MeshElement::edgesIterator() cons
 /// Create an iterator which iterate on faces linked with or owned by the element.
 /// This method call elementsIterator().
 ///////////////////////////////////////////////////////////////////////////////
-SMDS_Iterator<const SMDS_MeshElement *> * SMDS_MeshElement::facesIterator() const
+SMDS_ElemIteratorPtr SMDS_MeshElement::facesIterator() const
 {
 	return elementsIterator(SMDSAbs_Face);
 }
@@ -74,13 +80,12 @@ SMDS_Iterator<const SMDS_MeshElement *> * SMDS_MeshElement::facesIterator() cons
 int SMDS_MeshElement::NbNodes() const
 {
 	int nbnodes=0;
-	SMDS_Iterator<const SMDS_MeshElement *> * it=nodesIterator();
+	SMDS_ElemIteratorPtr it=nodesIterator();
 	while(it->more())
 	{
 		it->next();
 		nbnodes++;
 	}
-	delete it;
 	return nbnodes;
 }
 
@@ -90,13 +95,12 @@ int SMDS_MeshElement::NbNodes() const
 int SMDS_MeshElement::NbEdges() const
 {
 	int nbedges=0;
-	SMDS_Iterator<const SMDS_MeshElement *> * it=edgesIterator();
+	SMDS_ElemIteratorPtr it=edgesIterator();
 	while(it->more())
 	{
 		it->next();
 		nbedges++;
 	}
-	delete it;
 	return nbedges;
 }
 
@@ -106,55 +110,52 @@ int SMDS_MeshElement::NbEdges() const
 int SMDS_MeshElement::NbFaces() const
 {
 	int nbfaces=0;
-	SMDS_Iterator<const SMDS_MeshElement *> * it=facesIterator();
+	SMDS_ElemIteratorPtr it=facesIterator();
 	while(it->more())
 	{
 		it->next();
 		nbfaces++;
 	}
-	delete it;
 	return nbfaces;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-///Create and iterator which iterate on elements linked with the current element.
-///The iterator must be free by the caller (call delete myIterator).
+///Create an iterator which iterate on elements linked with the current element.
 ///@param type The of elements on which you want to iterate
-///@return An iterator, that you must free when you no longer need it
+///@return A smart pointer to iterator, you are not to take care of freeing memory
 ///////////////////////////////////////////////////////////////////////////////
-SMDS_Iterator<const SMDS_MeshElement *> * SMDS_MeshElement::
+class SMDS_MeshElement_MyIterator:public SMDS_ElemIterator
+{
+  const SMDS_MeshElement * myElement;
+  bool myMore;
+ public:
+  SMDS_MeshElement_MyIterator(const SMDS_MeshElement * element):
+    myElement(element),myMore(true) {}
+
+  bool more()
+  {
+    return myMore;
+  }
+
+  const SMDS_MeshElement* next()
+  {
+    myMore=false;
+    return myElement;	
+  }	
+};
+SMDS_ElemIteratorPtr SMDS_MeshElement::
 	elementsIterator(SMDSAbs_ElementType type) const
 {
 	/** @todo Check that iterator in the child classes return elements
 	in the same order for each different implementation (i.e: SMDS_VolumeOfNodes
 	and SMDS_VolumeOfFaces */
-	class MyIterator:public SMDS_Iterator<const SMDS_MeshElement*>
-	{
-		const SMDS_MeshElement * myElement;
-		bool myMore;
-	  public:
-		MyIterator(const SMDS_MeshElement * element):
-			myElement(element),myMore(true)
-		{
-		}
-
-		bool more()
-		{
-			return myMore;
-		}
-
-		const SMDS_MeshElement* next()
-		{
-			myMore=false;
-			return myElement;	
-		}	
-	};
 	
-	if(type==GetType()) return new MyIterator(this);
+	if(type==GetType())
+          return SMDS_ElemIteratorPtr(new SMDS_MeshElement_MyIterator(this));
 	else 
 	{
-		MESSAGE("Iterator not implemented");		
-		return NULL;
+          MESSAGE("Iterator not implemented");
+          return SMDS_ElemIteratorPtr((SMDS_ElemIterator*)NULL);
 	}
 }
 
@@ -189,4 +190,48 @@ bool operator<(const SMDS_MeshElement& e1, const SMDS_MeshElement& e2)
 
 	default : MESSAGE("Internal Error");
 	}
+        return false;
+}
+
+bool SMDS_MeshElement::IsValidIndex(const int ind) const
+{
+  return ( ind>-1 && ind<NbNodes() );
+}
+
+const SMDS_MeshNode* SMDS_MeshElement::GetNode(const int ind) const
+{
+  SMDS_ElemIteratorPtr it = nodesIterator();
+  int i = 0, index = WrappedIndex( ind );
+  while ( index != i++ )
+    it->next();
+  if ( it->more() )
+    return static_cast<const SMDS_MeshNode*> (it->next());
+  return 0;
+}
+
+bool SMDS_MeshElement::IsQuadratic() const
+{
+  return false;
+}
+
+bool SMDS_MeshElement::IsMediumNode(const SMDS_MeshNode* node) const
+{
+  return false;
+}
+
+//================================================================================
+  /*!
+   * \brief Check if a node belongs to the element
+    * \param node - the node to check
+    * \retval int - node index within the element, -1 if not found
+   */
+//================================================================================
+
+int SMDS_MeshElement::GetNodeIndex( const SMDS_MeshNode* node ) const
+{
+  SMDS_ElemIteratorPtr nIt = nodesIterator();
+  for ( int i = 0; nIt->more(); ++i )
+    if ( nIt->next() == node )
+      return i;
+  return -1;
 }