X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMDS%2FSMDS_MeshNode.cxx;h=c672fe702e0d856e35453df8204b4036653246f7;hp=6a9556031d5cad2a416b9d9ef6aed2bf05becb09;hb=e4737e85f0da6d3f90fd08f6be1c2825195fe16f;hpb=007c0191337598a9431229b2d3dec7fde25d4c4e

diff --git a/src/SMDS/SMDS_MeshNode.cxx b/src/SMDS/SMDS_MeshNode.cxx
index 6a9556031..c672fe702 100644
--- a/src/SMDS/SMDS_MeshNode.cxx
+++ b/src/SMDS/SMDS_MeshNode.cxx
@@ -18,78 +18,54 @@
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
 // 
 //  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
-//
-//
-//
-//  File   : SMDS_MeshNode.cxx
-//  Author : Jean-Michel BOULCOURT
-//  Module : SMESH
 
-using namespace std;
-#include "SMDS_MeshNode.ixx"
-#include "SMDS_ListIteratorOfListOfMeshElement.hxx"
-#include "SMDS_SpacePosition.hxx"
 
-static Handle(SMDS_Position)& StaticInstancePosition()
-{
-  static Handle(SMDS_SpacePosition) staticpos;
-  if (staticpos.IsNull())
-    staticpos = new SMDS_SpacePosition();
+#include "SMDS_MeshNode.hxx"
+#include "SMDS_SpacePosition.hxx"
+#include "SMDS_IteratorOfElements.hxx"
 
-  return staticpos;
-}
+using namespace std;
 
 //=======================================================================
 //function : SMDS_MeshNode
 //purpose  : 
 //=======================================================================
 
-SMDS_MeshNode::SMDS_MeshNode(const Standard_Integer ID,
-			     const Standard_Real x, const Standard_Real y, const Standard_Real z) :
-  SMDS_MeshElement(ID,1,SMDSAbs_Node),myPnt(x,y,z),myPosition(StaticInstancePosition())
+SMDS_MeshNode::SMDS_MeshNode(double x, double y, double z):
+	myX(x), myY(y), myZ(z),
+	myPosition(SMDS_SpacePosition::originSpacePosition())
 {
 }
 
-
 //=======================================================================
 //function : RemoveInverseElement
 //purpose  : 
 //=======================================================================
 
-void SMDS_MeshNode::RemoveInverseElement(const Handle(SMDS_MeshElement)& parent)
+void SMDS_MeshNode::RemoveInverseElement(const SMDS_MeshElement * parent)
 {
-
-  SMDS_ListIteratorOfListOfMeshElement itLstInvCnx(myInverseElements);
-
-  for (;itLstInvCnx.More();itLstInvCnx.Next()) {
-    Handle(SMDS_MeshElement)& ME = itLstInvCnx.Value();
-    if (ME->IsSame(parent))
-      myInverseElements.Remove(itLstInvCnx);
-    if (!itLstInvCnx.More())
-      break;
-  }
+	myInverseElements.erase(parent);
 }
 
-
 //=======================================================================
 //function : Print
 //purpose  : 
 //=======================================================================
 
-void SMDS_MeshNode::Print(Standard_OStream& OS) const
+void SMDS_MeshNode::Print(ostream & OS) const
 {
-  OS << "Node <" << myID << "> : X = " << myPnt.X() << " Y = " << myPnt.Y() << " Z = " << myPnt.Z() << endl;
+	OS << "Node <" << GetID() << "> : X = " << myX << " Y = "
+		<< myY << " Z = " << myZ << endl;
 }
 
-
 //=======================================================================
 //function : SetPosition
 //purpose  : 
 //=======================================================================
 
-void SMDS_MeshNode::SetPosition(const Handle(SMDS_Position)& aPos)
+void SMDS_MeshNode::SetPosition(const SMDS_PositionPtr& aPos)
 {
-  myPosition = aPos;
+	myPosition = aPos;
 }
 
 //=======================================================================
@@ -97,8 +73,162 @@ void SMDS_MeshNode::SetPosition(const Handle(SMDS_Position)& aPos)
 //purpose  : 
 //=======================================================================
 
-Handle(SMDS_Position) SMDS_MeshNode::GetPosition() const
+const SMDS_PositionPtr& SMDS_MeshNode::GetPosition() const
+{
+	return myPosition;
+}
+
+class SMDS_MeshNode_MyInvIterator:public SMDS_ElemIterator
+{
+  const set<const SMDS_MeshElement*>& mySet;
+  set<const SMDS_MeshElement*>::iterator myIterator;
+ public:
+  SMDS_MeshNode_MyInvIterator(const set<const SMDS_MeshElement*>& s):
+    mySet(s)
+  {
+    myIterator=mySet.begin();
+  }
+
+  bool more()
+  {
+    return myIterator!=mySet.end();
+  }
+
+  const SMDS_MeshElement* next()
+  {
+    const SMDS_MeshElement* current=*myIterator;
+    myIterator++;
+    return current;	
+  }	
+};
+
+SMDS_ElemIteratorPtr SMDS_MeshNode::
+	GetInverseElementIterator() const
+{
+  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
+{
+  set<const SMDS_MeshElement*> mySet;
+  set<const SMDS_MeshElement*>::iterator myIterator;
+ public:
+  SMDS_MeshNode_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()
+  {
+    return myIterator!=mySet.end();
+  }
+
+  const SMDS_MeshElement* next()
+  {
+    const SMDS_MeshElement* current=*myIterator;
+    myIterator++;
+    return current;
+  }
+};
+
+SMDS_ElemIteratorPtr SMDS_MeshNode::
+	elementsIterator(SMDSAbs_ElementType type) const
+{
+  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
+{
+	return 1;
+}
+
+double SMDS_MeshNode::X() const
+{
+	return myX;
+}
+
+double SMDS_MeshNode::Y() const
+{
+	return myY;
+}
+
+double SMDS_MeshNode::Z() const
+{
+	return myZ;
+}
+
+void SMDS_MeshNode::setXYZ(double x, double y, double z)
+{
+	myX=x;
+	myY=y;
+	myZ=z;	
+}
+
+SMDSAbs_ElementType SMDS_MeshNode::GetType() const
+{
+	return SMDSAbs_Node;
+}
+
+//=======================================================================
+//function : AddInverseElement
+//purpose  :
+//=======================================================================
+void SMDS_MeshNode::AddInverseElement(const SMDS_MeshElement* ME)
+{
+	myInverseElements.insert(ME);
+}
+
+//=======================================================================
+//function : ClearInverseElements
+//purpose  :
+//=======================================================================
+void SMDS_MeshNode::ClearInverseElements()
+{
+	myInverseElements.clear();
+}
+
+bool SMDS_MeshNode::emptyInverseElements()
+{
+	return myInverseElements.empty();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+/// To be used with STL set
+///////////////////////////////////////////////////////////////////////////////
+bool operator<(const SMDS_MeshNode& e1, const SMDS_MeshNode& e2)
 {
-  return myPosition;
+	return e1.GetID()<e2.GetID();
+	/*if(e1.myX<e2.myX) return true;
+	else if(e1.myX==e2.myX)
+	{
+	 	if(e1.myY<e2.myY) return true;
+		else if(e1.myY==e2.myY) return (e1.myZ<e2.myZ);
+		else return false;
+	}
+	else return false;*/
 }