X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMDS%2FSMDS_PolygonalFaceOfNodes.cxx;h=cecb7daa1b327c52f65863fe6bd82ef907dac414;hp=282256c7fb4d064508e0260dfd25cd245a9c56d1;hb=a11ec0f515b86d30e1617e522a2294d3320cb3c7;hpb=0635c9fc80f67d1e5dc0e94ec85f487286a92070 diff --git a/src/SMDS/SMDS_PolygonalFaceOfNodes.cxx b/src/SMDS/SMDS_PolygonalFaceOfNodes.cxx index 282256c7f..cecb7daa1 100644 --- a/src/SMDS/SMDS_PolygonalFaceOfNodes.cxx +++ b/src/SMDS/SMDS_PolygonalFaceOfNodes.cxx @@ -1,25 +1,26 @@ -// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2021 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 +// 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. +// 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, or (at your option) any later version. // -// 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. +// 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 +// 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// SMESH SMDS : implementaion of Salome mesh data structure + +// SMESH SMDS : implementation of Salome mesh data structure // #ifdef _MSC_VER #pragma warning(disable:4786) @@ -27,20 +28,19 @@ #include "SMDS_PolygonalFaceOfNodes.hxx" -#include "SMDS_IteratorOfElements.hxx" #include "SMDS_SetIterator.hxx" #include "SMDS_Mesh.hxx" -#include "utilities.h" +#include -using namespace std; +#include //======================================================================= //function : Constructor //purpose : //======================================================================= -SMDS_PolygonalFaceOfNodes::SMDS_PolygonalFaceOfNodes - (std::vector nodes) +SMDS_PolygonalFaceOfNodes:: +SMDS_PolygonalFaceOfNodes (const std::vector& nodes) { myNodes = nodes; } @@ -52,41 +52,40 @@ SMDS_PolygonalFaceOfNodes::SMDS_PolygonalFaceOfNodes SMDSAbs_ElementType SMDS_PolygonalFaceOfNodes::GetType() const { return SMDSAbs_Face; - //return SMDSAbs_PolygonalFace; } //======================================================================= //function : ChangeNodes //purpose : //======================================================================= -bool SMDS_PolygonalFaceOfNodes::ChangeNodes (std::vector nodes) -{ - if (nodes.size() < 3) - return false; +// bool SMDS_PolygonalFaceOfNodes::ChangeNodes (std::vector nodes) +// { +// if (nodes.size() < 3) +// return false; - myNodes = nodes; +// myNodes = nodes; - return true; -} +// return true; +// } //======================================================================= //function : ChangeNodes //purpose : to support the same interface, as SMDS_FaceOfNodes //======================================================================= -bool SMDS_PolygonalFaceOfNodes::ChangeNodes (const SMDS_MeshNode* nodes[], - const int nbNodes) -{ - if (nbNodes < 3) - return false; +// bool SMDS_PolygonalFaceOfNodes::ChangeNodes (const SMDS_MeshNode* nodes[], +// const int nbNodes) +// { +// if (nbNodes < 3) +// return false; - myNodes.resize(nbNodes); - int i = 0; - for (; i < nbNodes; i++) { - myNodes[i] = nodes[i]; - } +// myNodes.resize(nbNodes); +// int i = 0; +// for (; i < nbNodes; i++) { +// myNodes[i] = nodes[i]; +// } - return true; -} +// return true; +// } //======================================================================= //function : NbNodes @@ -128,74 +127,28 @@ void SMDS_PolygonalFaceOfNodes::Print(ostream & OS) const OS << myNodes[i] << ") " << endl; } -//======================================================================= -//function : elementsIterator -//purpose : -//======================================================================= -class SMDS_PolygonalFaceOfNodes_MyIterator:public SMDS_NodeVectorElemIterator -{ - public: - SMDS_PolygonalFaceOfNodes_MyIterator(const vector& s): - SMDS_NodeVectorElemIterator( s.begin(), s.end() ) {} -}; - /// =================================================================== /*! * \brief Iterator on edges of face */ /// =================================================================== -class _MyEdgeIterator : public SMDS_ElemIterator -{ - vector< const SMDS_MeshElement* > myElems; - int myIndex; -public: - _MyEdgeIterator(const SMDS_MeshFace* face):myIndex(0) { - myElems.reserve( face->NbNodes() ); - for ( int i = 0; i < face->NbNodes(); ++i ) { - const SMDS_MeshElement* edge = - SMDS_Mesh::FindEdge( face->GetNode( i ), face->GetNode( i + 1 )); - if ( edge ) - myElems.push_back( edge ); - } - } - /// Return true if and only if there are other object in this iterator - virtual bool more() { return myIndex < myElems.size(); } - - /// Return the current object and step to the next one - virtual const SMDS_MeshElement* next() { return myElems[ myIndex++ ]; } -}; - -SMDS_ElemIteratorPtr SMDS_PolygonalFaceOfNodes::elementsIterator - (SMDSAbs_ElementType type) const -{ - switch(type) - { - case SMDSAbs_Face: - return SMDS_MeshElement::elementsIterator(SMDSAbs_Face); - case SMDSAbs_Node: - return SMDS_ElemIteratorPtr(new SMDS_PolygonalFaceOfNodes_MyIterator(myNodes)); - case SMDSAbs_Edge: - return SMDS_ElemIteratorPtr(new _MyEdgeIterator( this )); - break; - default: - return SMDS_ElemIteratorPtr - (new SMDS_IteratorOfElements - (this,type,SMDS_ElemIteratorPtr - (new SMDS_PolygonalFaceOfNodes_MyIterator(myNodes)))); - } - return SMDS_ElemIteratorPtr(); -} - /*! * \brief Return node by its index * \param ind - node index * \retval const SMDS_MeshNode* - the node - * - * Index is wrapped if it is out of a valid range */ const SMDS_MeshNode* SMDS_PolygonalFaceOfNodes::GetNode(const int ind) const { return myNodes[ WrappedIndex( ind )]; } +SMDS_ElemIteratorPtr SMDS_PolygonalFaceOfNodes::nodesIterator() const +{ + return boost::make_shared< SMDS_NodeArrayElemIterator >( &myNodes[0], &myNodes[0] + NbNodes() ); +} + +SMDS_NodeIteratorPtr SMDS_PolygonalFaceOfNodes::nodeIterator() const +{ + return boost::make_shared< SMDS_NodeArrayIterator >( &myNodes[0], &myNodes[0] + NbNodes() ); +}