X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMDS%2FSMDS_MeshNode.cxx;h=06ab12173d871505c7ab482c4937e6796ea01b2c;hb=22f20048e0fb430a15d242af597ec57a904fbb19;hp=271d53fe08327e422c8410adcf8fe85667189fef;hpb=484fe83a97f643207334576fbe08d4a90d67fd37;p=modules%2Fsmesh.git

diff --git a/src/SMDS/SMDS_MeshNode.cxx b/src/SMDS/SMDS_MeshNode.cxx
index 271d53fe0..06ab12173 100644
--- a/src/SMDS/SMDS_MeshNode.cxx
+++ b/src/SMDS/SMDS_MeshNode.cxx
@@ -19,11 +19,16 @@
 // 
 //  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
 
+#ifdef _MSC_VER
+#pragma warning(disable:4786)
+#endif
 
 #include "SMDS_MeshNode.hxx"
 #include "SMDS_SpacePosition.hxx"
 #include "SMDS_IteratorOfElements.hxx"
 
+using namespace std;
+
 //=======================================================================
 //function : SMDS_MeshNode
 //purpose  : 
@@ -42,7 +47,14 @@ SMDS_MeshNode::SMDS_MeshNode(double x, double y, double z):
 
 void SMDS_MeshNode::RemoveInverseElement(const SMDS_MeshElement * parent)
 {
-	myInverseElements.erase(parent);
+  NCollection_List<const SMDS_MeshElement*>::Iterator it(myInverseElements);
+  while (it.More()) {
+    const SMDS_MeshElement* elem = it.Value();
+    if (elem == parent)
+      myInverseElements.Remove(it);
+    else
+      it.Next();
+  }
 }
 
 //=======================================================================
@@ -61,7 +73,7 @@ void SMDS_MeshNode::Print(ostream & OS) const
 //purpose  : 
 //=======================================================================
 
-void SMDS_MeshNode::SetPosition(SMDS_Position * aPos)
+void SMDS_MeshNode::SetPosition(const SMDS_PositionPtr& aPos)
 {
 	myPosition = aPos;
 }
@@ -71,94 +83,88 @@ void SMDS_MeshNode::SetPosition(SMDS_Position * aPos)
 //purpose  : 
 //=======================================================================
 
-SMDS_Position *SMDS_MeshNode::GetPosition()
+const SMDS_PositionPtr& SMDS_MeshNode::GetPosition() const
 {
 	return myPosition;
 }
 
-const SMDS_Position *SMDS_MeshNode::GetPosition() const
+class SMDS_MeshNode_MyInvIterator:public SMDS_ElemIterator
 {
-	return myPosition;
-}
-/**
-*/
-SMDS_Iterator<const SMDS_MeshElement*> * SMDS_MeshNode::
+  NCollection_List<const SMDS_MeshElement*>::Iterator myIterator;
+ public:
+  SMDS_MeshNode_MyInvIterator(const NCollection_List<const SMDS_MeshElement*>& s):
+    myIterator(s)
+  {}
+
+  bool more()
+  {
+    return myIterator.More() != Standard_False;
+  }
+
+  const SMDS_MeshElement* next()
+  {
+    const SMDS_MeshElement* current=myIterator.Value();
+    myIterator.Next();
+    return current;
+  }	
+};
+
+SMDS_ElemIteratorPtr SMDS_MeshNode::
 	GetInverseElementIterator() const
 {
-	class SMDS_InverseElementIterator:public SMDS_Iterator<const SMDS_MeshElement*>
-	{
-		const set<const SMDS_MeshElement*>& mySet;
-		set<const SMDS_MeshElement*>::iterator myIterator;
-	  public:
-		SMDS_InverseElementIterator(const set<const SMDS_MeshElement*>& s):mySet(s)
-		{
-			myIterator=mySet.begin();
-		}
-
-		bool more()
-		{
-			myIterator!=mySet.end();
-		}
-
-		const SMDS_MeshElement* next()
-		{
-			const SMDS_MeshElement* current=*myIterator;
-			myIterator++;
-			return current;	
-		}	
-	};
-	return new SMDS_InverseElementIterator(myInverseElements);
-}
-
-SMDS_Iterator<const SMDS_MeshElement *> * SMDS_MeshNode::
+  return SMDS_ElemIteratorPtr(new SMDS_MeshNode_MyInvIterator(myInverseElements));
+}
+
+// Same as GetInverseElementIterator but the create iterator only return
+// wanted type elements.
+class SMDS_MeshNode_MyIterator:public SMDS_ElemIterator
+{
+  NCollection_List<const SMDS_MeshElement*> mySet;
+  NCollection_List<const SMDS_MeshElement*>::Iterator myIterator;
+ public:
+  SMDS_MeshNode_MyIterator(SMDSAbs_ElementType type,
+                           const NCollection_List<const SMDS_MeshElement*>& s)
+  {
+    const SMDS_MeshElement * e;
+    bool toInsert;
+    NCollection_List<const SMDS_MeshElement*>::Iterator it(s);
+    for(; it.More(); it.Next())
+    {
+      e=it.Value();
+      switch(type)
+      {
+      case SMDSAbs_Edge: toInsert=true; break;
+      case SMDSAbs_Face: toInsert=(e->GetType()!=SMDSAbs_Edge); break;
+      case SMDSAbs_Volume: toInsert=(e->GetType()==SMDSAbs_Volume); break;
+      }
+      if(toInsert) mySet.Append(e);
+    }
+    myIterator.Init(mySet);
+  }
+
+  bool more()
+  {
+    return myIterator.More() != Standard_False;
+  }
+
+  const SMDS_MeshElement* next()
+  {
+    const SMDS_MeshElement* current=myIterator.Value();
+    myIterator.Next();
+    return current;
+  }
+};
+
+SMDS_ElemIteratorPtr SMDS_MeshNode::
 	elementsIterator(SMDSAbs_ElementType type) const
 {
-	// Same as GetInverseElementIterator but the create iterator only return
-	// wanted type elements.
-	class MyIterator:public SMDS_Iterator<const SMDS_MeshElement*>
-	{
-		set<const SMDS_MeshElement*> mySet;
-		set<const SMDS_MeshElement*>::iterator myIterator;
-	  public:
-		MyIterator(SMDSAbs_ElementType type,
-			const set<const SMDS_MeshElement*>& s) 
-		{
-			const SMDS_MeshElement * e;
-			bool toInsert;
-			set<const SMDS_MeshElement*>::iterator it=s.begin();
-			while(it!=s.end())
-			{
-				e=*it;
-				switch(type)
-				{
-				case SMDSAbs_Edge: toInsert=true; break;
-				case SMDSAbs_Face: toInsert=(e->GetType()!=SMDSAbs_Edge); break;
-				case SMDSAbs_Volume: toInsert=(e->GetType()==SMDSAbs_Volume); break;
-				}
-				if(toInsert) mySet.insert(e);
-				it++;
-			}	
-			myIterator=mySet.begin();
-		}
-
-		bool more()
-		{
-			myIterator!=mySet.end();
-		}
-
-		const SMDS_MeshElement* next()
-		{
-			const SMDS_MeshElement* current=*myIterator;
-			myIterator++;
-			return current;	
-		}	
-	};
-
-	if(type==SMDSAbs_Node)
-		return SMDS_MeshElement::elementsIterator(SMDSAbs_Node); 
-	else
-		return new SMDS_IteratorOfElements(this,type,
-			new MyIterator(type, myInverseElements));
+  if(type==SMDSAbs_Node)
+    return SMDS_MeshElement::elementsIterator(SMDSAbs_Node); 
+  else
+    return SMDS_ElemIteratorPtr
+      (new SMDS_IteratorOfElements
+       (this,type,
+        SMDS_ElemIteratorPtr(new SMDS_MeshNode_MyIterator(type, myInverseElements))));
 }
 
 int SMDS_MeshNode::NbNodes() const
@@ -199,7 +205,13 @@ SMDSAbs_ElementType SMDS_MeshNode::GetType() const
 //=======================================================================
 void SMDS_MeshNode::AddInverseElement(const SMDS_MeshElement* ME)
 {
-	myInverseElements.insert(ME);
+  NCollection_List<const SMDS_MeshElement*>::Iterator it(myInverseElements);
+  for (; it.More(); it.Next()) {
+    const SMDS_MeshElement* elem = it.Value();
+    if (elem == ME)
+      return;
+  }
+  myInverseElements.Append(ME);
 }
 
 //=======================================================================
@@ -208,12 +220,12 @@ void SMDS_MeshNode::AddInverseElement(const SMDS_MeshElement* ME)
 //=======================================================================
 void SMDS_MeshNode::ClearInverseElements()
 {
-	myInverseElements.clear();
+  myInverseElements.Clear();
 }
 
 bool SMDS_MeshNode::emptyInverseElements()
 {
-	return myInverseElements.empty();
+  return myInverseElements.IsEmpty() != Standard_False;
 }
 
 ///////////////////////////////////////////////////////////////////////////////