X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMDS%2FSMDS_MeshEdge.cxx;h=66c8ae3d5cf36edf2e0ff37545f40a6e4d2e4b43;hb=bbdbca270f2d1247d7a49c8500108099b9369ec6;hp=c6d6b787929562c435bb4c8eb35d9a07b3172940;hpb=4791f5b30ea7a9c1247aa551750dc71cb83b99aa;p=modules%2Fsmesh.git

diff --git a/src/SMDS/SMDS_MeshEdge.cxx b/src/SMDS/SMDS_MeshEdge.cxx
index c6d6b7879..66c8ae3d5 100644
--- a/src/SMDS/SMDS_MeshEdge.cxx
+++ b/src/SMDS/SMDS_MeshEdge.cxx
@@ -25,50 +25,126 @@
 //  Author : Jean-Michel BOULCOURT
 //  Module : SMESH
 
+#ifdef _MSC_VER
+#pragma warning(disable:4786)
+#endif
+
+#include "SMDS_MeshEdge.hxx"
+#include "SMDS_IteratorOfElements.hxx"
+#include "SMDS_MeshNode.hxx"
+
 using namespace std;
-#include "SMDS_MeshEdge.ixx"
 
 //=======================================================================
 //function : SMDS_MeshEdge
 //purpose  : 
 //=======================================================================
 
-SMDS_MeshEdge::SMDS_MeshEdge(const Standard_Integer ID,
-			     const Standard_Integer idnode1, 
-			     const Standard_Integer idnode2) :
-SMDS_MeshElement(ID,2,SMDSAbs_Edge)
-{
-  SetConnections(idnode1,idnode2);
-  ComputeKey();
+SMDS_MeshEdge::SMDS_MeshEdge(const SMDS_MeshNode * node1,
+                             const SMDS_MeshNode * node2)
+{	
+	myNodes[0]=node1;
+	myNodes[1]=node2;
 }
 
 //=======================================================================
-//function : SetConnections
+//function : Print
 //purpose  : 
 //=======================================================================
-void SMDS_MeshEdge::SetConnections(const Standard_Integer idnode1, 
-				   const Standard_Integer idnode2)
+
+void SMDS_MeshEdge::Print(ostream & OS) const
+{
+	OS << "edge <" << GetID() << "> : (" << myNodes[0] << " , " << myNodes[1] <<
+		") " << endl;
+}
+
+int SMDS_MeshEdge::NbNodes() const
 {
-  Standard_Integer idmin = (idnode1 < idnode2? idnode1 : idnode2);
+	return 2;
+}
+
+int SMDS_MeshEdge::NbEdges() const
+{
+	return 1;
+}
 
-  myNodes[0] = idmin;
-  if (idmin == idnode1) {
-    myNodes[1] = idnode2;
-  } else {
-    myNodes[1] = idnode1;
+SMDSAbs_ElementType SMDS_MeshEdge::GetType() const
+{
+	return SMDSAbs_Edge;
+}
+
+class SMDS_MeshEdge_MyNodeIterator:public SMDS_ElemIterator
+{
+  const SMDS_MeshNode *const* myNodes;
+  int myIndex;
+ public:
+  SMDS_MeshEdge_MyNodeIterator(const SMDS_MeshNode * const* nodes):
+    myNodes(nodes),myIndex(0) {}
+
+  bool more()
+  {
+    return myIndex<2;
+  }
+
+  const SMDS_MeshElement* next()
+  {
+    myIndex++;
+    return myNodes[myIndex-1];
+  }
+};
+
+SMDS_ElemIteratorPtr SMDS_MeshEdge::
+	elementsIterator(SMDSAbs_ElementType type) const
+{
+  switch(type)
+  {
+  case SMDSAbs_Edge:
+    return SMDS_MeshElement::elementsIterator(SMDSAbs_Edge); 
+  case SMDSAbs_Node:
+    return SMDS_ElemIteratorPtr(new SMDS_MeshEdge_MyNodeIterator(myNodes));
+  default:
+    return SMDS_ElemIteratorPtr
+      (new SMDS_IteratorOfElements
+       (this,type, SMDS_ElemIteratorPtr(new SMDS_MeshEdge_MyNodeIterator(myNodes))));
   }
 }
 
+bool operator<(const SMDS_MeshEdge & e1, const SMDS_MeshEdge & e2)
+{
+	int id11=e1.myNodes[0]->GetID();
+	int id21=e2.myNodes[0]->GetID();
+	int id12=e1.myNodes[1]->GetID();
+	int id22=e2.myNodes[1]->GetID();
+	int tmp;
+
+	if(id11>=id12) 
+	{
+		tmp=id11;
+		id11=id12;
+		id12=tmp;	
+	}
+	if(id21>=id22) 
+	{
+		tmp=id21;
+		id21=id22;
+		id22=tmp;	
+	}
+
+	if(id11<id21) return true;
+	else if(id11==id21) return (id21<id22);
+	else return false;
+}
+
 //=======================================================================
-//function : Print
+//function : ChangeNodes
 //purpose  : 
 //=======================================================================
 
-void SMDS_MeshEdge::Print(Standard_OStream& OS) const
+bool SMDS_MeshEdge::ChangeNodes(const SMDS_MeshNode * node1,
+                                const SMDS_MeshNode * node2)
 {
-  OS << "edge <" << myID <<"> : (" << myNodes[0] << " , " << myNodes[1] << ") " << endl;  
+  myNodes[0]=node1;
+  myNodes[1]=node2;
+  return true;
 }
 
-
-
-