X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMDS%2FSMDS_QuadraticFaceOfNodes.cxx;h=f427dac9692b7c7ae9e0dcae55ac908d0855a8e6;hb=df9cc07c95bbe75654ed43634939a133ccebe2f6;hp=43093dafb2e29cbd1a543263535ba0e1421d7144;hpb=bd8f1aee7c78f7d2eb82bd4fec5e08c9e3d280ce;p=modules%2Fsmesh.git diff --git a/src/SMDS/SMDS_QuadraticFaceOfNodes.cxx b/src/SMDS/SMDS_QuadraticFaceOfNodes.cxx index 43093dafb..f427dac96 100644 --- a/src/SMDS/SMDS_QuadraticFaceOfNodes.cxx +++ b/src/SMDS/SMDS_QuadraticFaceOfNodes.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2015 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 @@ -6,7 +6,7 @@ // 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. +// 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 @@ -192,21 +192,6 @@ namespace { } }; - //======================================================================= - //class : _MyInterlacedNodeElemIterator - //purpose : - //======================================================================= - - class _MyInterlacedNodeElemIterator : public SMDS_ElemIterator - { - SMDS_NodeIteratorPtr myItr; - public: - _MyInterlacedNodeElemIterator(SMDS_NodeIteratorPtr interlacedNodeItr): - myItr( interlacedNodeItr ) {} - bool more() { return myItr->more(); } - const SMDS_MeshElement* next() { return myItr->next(); } - }; - //======================================================================= //class : _MyNodeIterator //purpose : @@ -234,16 +219,6 @@ SMDS_NodeIteratorPtr SMDS_QuadraticFaceOfNodes::interlacedNodesIterator() const (new _MyInterlacedNodeIterator (myNodes, myNodes.size()==6 ? triaInterlace : quadInterlace)); } -//======================================================================= -//function : interlacedNodesElemIterator -//purpose : -//======================================================================= - -SMDS_ElemIteratorPtr SMDS_QuadraticFaceOfNodes::interlacedNodesElemIterator() const -{ - return SMDS_ElemIteratorPtr - (new _MyInterlacedNodeElemIterator ( interlacedNodesIterator() )); -} /// =================================================================== /*! * \brief Iterator on edges of face @@ -257,10 +232,10 @@ class _MyEdgeIterator : public SMDS_ElemIterator public: _MyEdgeIterator(const SMDS_QuadraticFaceOfNodes* face):myIndex(0) { myElems.reserve( face->NbNodes() ); - SMDS_ElemIteratorPtr nIt = face->interlacedNodesElemIterator(); + SMDS_NodeIteratorPtr nIt = face->interlacedNodesIterator(); const SMDS_MeshNode* n0 = face->GetNodeWrap( -1 ); while ( nIt->more() ) { - const SMDS_MeshNode* n1 = static_cast( nIt->next() ); + const SMDS_MeshNode* n1 = nIt->next(); const SMDS_MeshElement* edge = SMDS_Mesh::FindEdge( n0, n1 ); if ( edge ) myElems.push_back( edge );