X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMDS%2FSMDS_MeshEdge.cxx;h=3f7994c1ffd9ca18a8c26de8b69fab0235fa8461;hp=cbb448286ed7224851c619f6807fdd06a0e0ff78;hb=81ed9b466227afdcbe317611cc580ca4f185cb74;hpb=bef9beee88cac57394b8dc3bc914381c1a2fff83

diff --git a/src/SMDS/SMDS_MeshEdge.cxx b/src/SMDS/SMDS_MeshEdge.cxx
index cbb448286..3f7994c1f 100644
--- a/src/SMDS/SMDS_MeshEdge.cxx
+++ b/src/SMDS/SMDS_MeshEdge.cxx
@@ -1,53 +1,127 @@
-using namespace std;
-// File:	SMDS_MeshEdge.cxx
-// Created:	Wed Jan 23 17:02:20 2002
-// Author:	Jean-Michel BOULCOURT
-//		<jmb@coulox.paris1.matra-dtv.fr>
+//  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 
+//
+//
+//
+//  File   : SMDS_MeshEdge.cxx
+//  Author : Jean-Michel BOULCOURT
+//  Module : SMESH
 
 
-#include "SMDS_MeshEdge.ixx"
+#include "SMDS_MeshEdge.hxx"
+#include "SMDS_IteratorOfElements.hxx"
+#include "SMDS_MeshNode.hxx"
+#include <iostream>
 
 //=======================================================================
 //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(SMDS_MeshNode * node1, 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
 {
-  Standard_Integer idmin = (idnode1 < idnode2? idnode1 : idnode2);
-
-  myNodes[0] = idmin;
-  if (idmin == idnode1) {
-    myNodes[1] = idnode2;
-  } else {
-    myNodes[1] = idnode1;
-  }
+	OS << "edge <" << GetID() << "> : (" << myNodes[0] << " , " << myNodes[1] <<
+		") " << endl;
 }
 
-//=======================================================================
-//function : Print
-//purpose  : 
-//=======================================================================
+int SMDS_MeshEdge::NbNodes() const
+{
+	return 2;
+}
+
+int SMDS_MeshEdge::NbEdges() const
+{
+	return 1;
+}
 
-void SMDS_MeshEdge::Print(Standard_OStream& OS) const
+SMDSAbs_ElementType SMDS_MeshEdge::GetType() const
 {
-  OS << "edge <" << myID <<"> : (" << myNodes[0] << " , " << myNodes[1] << ") " << endl;  
+	return SMDSAbs_Edge;
 }
 
+SMDS_Iterator<const SMDS_MeshElement *> * SMDS_MeshEdge::
+	elementsIterator(SMDSAbs_ElementType type) const
+{
+	class MyNodeIterator:public SMDS_Iterator<const SMDS_MeshElement *>
+	{
+		SMDS_MeshNode *const* myNodes;
+		int myIndex;
+	  public:
+		MyNodeIterator(SMDS_MeshNode * const* nodes):myNodes(nodes),myIndex(0)
+		{}	
+
+		bool more()
+		{
+			return myIndex<2;
+		}
+
+		const SMDS_MeshElement* next()
+		{
+			myIndex++;
+			return myNodes[myIndex-1];
+		}	
+	};
 
+	switch(type)
+	{
+	case SMDSAbs_Edge:return SMDS_MeshElement::elementsIterator(SMDSAbs_Edge); 
+	case SMDSAbs_Node:return new MyNodeIterator(myNodes);
+	default: return new SMDS_IteratorOfElements(this,type, nodesIterator());
+	}
 
+}
+
+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;
+}