X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMDS%2FSMDS_MeshEdge.cxx;h=1910a3a4b3559fd75e2a6f8818835b627bb3661e;hb=84e136e74b2bc729df20617a9968439919337a55;hp=3f7994c1ffd9ca18a8c26de8b69fab0235fa8461;hpb=484fe83a97f643207334576fbe08d4a90d67fd37;p=modules%2Fsmesh.git diff --git a/src/SMDS/SMDS_MeshEdge.cxx b/src/SMDS/SMDS_MeshEdge.cxx index 3f7994c1f..1910a3a4b 100644 --- a/src/SMDS/SMDS_MeshEdge.cxx +++ b/src/SMDS/SMDS_MeshEdge.cxx @@ -1,45 +1,50 @@ -// SMESH SMDS : implementaion of Salome mesh data structure +// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 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. // -// 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 +// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com // + +// SMESH SMDS : implementaion of Salome mesh data structure // File : SMDS_MeshEdge.cxx // 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" -#include + +using namespace std; //======================================================================= //function : SMDS_MeshEdge //purpose : //======================================================================= -SMDS_MeshEdge::SMDS_MeshEdge(SMDS_MeshNode * node1, SMDS_MeshNode * node2) -{ - myNodes[0]=node1; - myNodes[1]=node2; +SMDS_MeshEdge::SMDS_MeshEdge(const SMDS_MeshNode * node1, + const SMDS_MeshNode * node2) +{ + myNodes[0]=node1; + myNodes[1]=node2; } //======================================================================= @@ -49,79 +54,106 @@ SMDS_MeshEdge::SMDS_MeshEdge(SMDS_MeshNode * node1, SMDS_MeshNode * node2) void SMDS_MeshEdge::Print(ostream & OS) const { - OS << "edge <" << GetID() << "> : (" << myNodes[0] << " , " << myNodes[1] << - ") " << endl; + OS << "edge <" << GetID() << "> : (" << myNodes[0] << " , " << myNodes[1] << + ") " << endl; } int SMDS_MeshEdge::NbNodes() const { - return 2; + return 2; } int SMDS_MeshEdge::NbEdges() const { - return 1; + return 1; } SMDSAbs_ElementType SMDS_MeshEdge::GetType() const { - return SMDSAbs_Edge; + return SMDSAbs_Edge; } -SMDS_Iterator * SMDS_MeshEdge:: - elementsIterator(SMDSAbs_ElementType type) const +class SMDS_MeshEdge_MyNodeIterator:public SMDS_ElemIterator { - class MyNodeIterator:public SMDS_Iterator - { - 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()); - } - + 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(id11GetID(); + 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