X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHDS%2FSMESHDS_SubMesh.cxx;h=0013e54e162ef89a80febb483a22a60435ffce2b;hb=0f691b4cc1132607f23e16dd03ee775f5cc585f3;hp=e2e1494adb9d375749adf7c6cd3c3fde0f73f50b;hpb=2d46bce2985c40bfac0593abad88d590a8efca48;p=modules%2Fsmesh.git diff --git a/src/SMESHDS/SMESHDS_SubMesh.cxx b/src/SMESHDS/SMESHDS_SubMesh.cxx index e2e1494ad..0013e54e1 100644 --- a/src/SMESHDS/SMESHDS_SubMesh.cxx +++ b/src/SMESHDS/SMESHDS_SubMesh.cxx @@ -1,43 +1,36 @@ -// SMESH SMESHDS : management of mesh data and SMESH document +// Copyright (C) 2007-2008 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 SMESHDS : management of mesh data and SMESH document // File : SMESH_SubMesh.cxx // Author : Yves FRICAUD, OCC // Module : SMESH // $Header: - -using namespace std; +// #include "SMESHDS_SubMesh.hxx" -//======================================================================= -//function : SMESHDS_SubMesh -//purpose : -//======================================================================= -SMESHDS_SubMesh::SMESHDS_SubMesh(const SMDS_Mesh * M):myMesh(M) -{ - myListOfEltIDIsUpdate = false; - myListOfNodeIDIsUpdate = false; -} +#include "utilities.h" +#include "SMDS_SetIterator.hxx" + +using namespace std; //======================================================================= //function : AddElement @@ -45,18 +38,30 @@ SMESHDS_SubMesh::SMESHDS_SubMesh(const SMDS_Mesh * M):myMesh(M) //======================================================================= void SMESHDS_SubMesh::AddElement(const SMDS_MeshElement * ME) { - myElements.insert(ME); - myListOfEltIDIsUpdate = false; + if ( !IsComplexSubmesh() ) + myElements.insert(ME); } //======================================================================= //function : RemoveElement //purpose : //======================================================================= -void SMESHDS_SubMesh::RemoveElement(const SMDS_MeshElement * ME) +bool SMESHDS_SubMesh::RemoveElement(const SMDS_MeshElement * ME, bool isElemDeleted) { - myElements.erase(ME); - myListOfEltIDIsUpdate = false; + if ( !IsComplexSubmesh() && NbElements() ) { + + if (!isElemDeleted) // alive element has valid ID and can be found + return myElements.erase(ME); + + TElemSet::iterator e = myElements.begin(), eEnd = myElements.end(); + for ( ; e != eEnd; ++e ) + if ( ME == *e ) { + myElements.erase( e ); + return true; + } + } + + return false; } //======================================================================= @@ -65,18 +70,31 @@ void SMESHDS_SubMesh::RemoveElement(const SMDS_MeshElement * ME) //======================================================================= void SMESHDS_SubMesh::AddNode(const SMDS_MeshNode * N) { - myNodes.insert(N); - myListOfNodeIDIsUpdate = false; + if ( !IsComplexSubmesh() ) + myNodes.insert(N); } //======================================================================= //function : RemoveNode //purpose : //======================================================================= -void SMESHDS_SubMesh::RemoveNode(const SMDS_MeshNode * N) + +bool SMESHDS_SubMesh::RemoveNode(const SMDS_MeshNode * N, bool isNodeDeleted) { - myNodes.erase(N); - myListOfNodeIDIsUpdate = false; + if ( !IsComplexSubmesh() && NbNodes() ) { + + if (!isNodeDeleted) // alive node has valid ID and can be found + return myNodes.erase(N); + + TElemSet::iterator e = myNodes.begin(), eEnd = myNodes.end(); + for ( ; e != eEnd; ++e ) + if ( N == *e ) { + myNodes.erase( e ); + return true; + } + } + + return false; } //======================================================================= @@ -85,70 +103,221 @@ void SMESHDS_SubMesh::RemoveNode(const SMDS_MeshNode * N) //======================================================================= int SMESHDS_SubMesh::NbElements() const { - return myElements.size(); + if ( !IsComplexSubmesh() ) + return myElements.size(); + + int nbElems = 0; + set::const_iterator it = mySubMeshes.begin(); + for ( ; it != mySubMeshes.end(); it++ ) + nbElems += (*it)->NbElements(); + + return nbElems; } //======================================================================= -//function : GetElements +//function : NbNodes //purpose : //======================================================================= -const set & SMESHDS_SubMesh::GetElements() + +int SMESHDS_SubMesh::NbNodes() const { - return myElements; + if ( !IsComplexSubmesh() ) + return myNodes.size(); + + int nbElems = 0; + set::const_iterator it = mySubMeshes.begin(); + for ( ; it != mySubMeshes.end(); it++ ) + nbElems += (*it)->NbNodes(); + + return nbElems; } +// ===================== +// class MySetIterator +// ===================== + +template class MySetIterator: + public SMDS_SetIterator +{ + typedef SMDS_SetIterator TFather; + public: + MySetIterator(const TSET& s):TFather(s.begin(),s.end()) + { + } +}; + +// ===================== +// class MyIterator +// ===================== + +template class MyIterator : public SMDS_Iterator +{ + public: + MyIterator (const set& theSubMeshes) + : mySubIt( theSubMeshes.begin() ), mySubEnd( theSubMeshes.end() ), myMore(false) + {} + bool more() + { + while (( !myElemIt.get() || !myElemIt->more() ) && mySubIt != mySubEnd) + { + myElemIt = getElements(*mySubIt); + mySubIt++; + } + myMore = myElemIt.get() && myElemIt->more(); + return myMore; + } + VALUE next() + { + VALUE elem = 0; + if ( myMore ) + elem = myElemIt->next(); + return elem; + } + protected: + virtual boost::shared_ptr< SMDS_Iterator > + getElements(const SMESHDS_SubMesh*) const = 0; + + private: + bool myMore; + set::const_iterator mySubIt, mySubEnd; + boost::shared_ptr< SMDS_Iterator > myElemIt; +}; + +// ===================== +// class MyElemIterator +// ===================== + +class MyElemIterator: public MyIterator +{ + public: + MyElemIterator (const set& theSubMeshes) + :MyIterator( theSubMeshes ) {} + SMDS_ElemIteratorPtr getElements(const SMESHDS_SubMesh* theSubMesh) const + { return theSubMesh->GetElements(); } +}; + +// ===================== +// class MyNodeIterator +// ===================== + +class MyNodeIterator: public MyIterator +{ + public: + MyNodeIterator (const set& theSubMeshes) + :MyIterator( theSubMeshes ) {} + SMDS_NodeIteratorPtr getElements(const SMESHDS_SubMesh* theSubMesh) const + { return theSubMesh->GetNodes(); } +}; + //======================================================================= -//function : NbNodes +//function : GetElements //purpose : //======================================================================= -int SMESHDS_SubMesh::NbNodes() const + +SMDS_ElemIteratorPtr SMESHDS_SubMesh::GetElements() const { - return myNodes.size(); + if ( IsComplexSubmesh() ) + return SMDS_ElemIteratorPtr( new MyElemIterator( mySubMeshes )); + + return SMDS_ElemIteratorPtr(new MySetIterator(myElements)); } //======================================================================= //function : GetNodes //purpose : //======================================================================= -const set & SMESHDS_SubMesh::GetNodes() const + +SMDS_NodeIteratorPtr SMESHDS_SubMesh::GetNodes() const { - return myNodes; + if ( IsComplexSubmesh() ) + return SMDS_NodeIteratorPtr( new MyNodeIterator( mySubMeshes )); + + return SMDS_NodeIteratorPtr(new MySetIterator(myNodes)); } //======================================================================= -//function : GetIDElements +//function : Contains +//purpose : check if elem or node is in +//======================================================================= + +bool SMESHDS_SubMesh::Contains(const SMDS_MeshElement * ME) const +{ + // DO NOT TRY TO FIND A REMOVED ELEMENT !! + //if ( IsComplexSubmesh() || !ME ) + if (!ME ) + return false; + + if ( IsComplexSubmesh() ) + { + set::const_iterator aSubIt = mySubMeshes.begin(); + for ( ; aSubIt != mySubMeshes.end(); aSubIt++ ) + if ( (*aSubIt)->Contains( ME )) + return true; + return false; + } + + if ( ME->GetType() == SMDSAbs_Node ) + return ( myNodes.find( ME ) != myNodes.end() ); + + return ( myElements.find( ME ) != myElements.end() ); +} + +//======================================================================= +//function : AddSubMesh //purpose : //======================================================================= -const vector & SMESHDS_SubMesh::GetIDElements() + +void SMESHDS_SubMesh::AddSubMesh( const SMESHDS_SubMesh* theSubMesh ) { - if (!myListOfEltIDIsUpdate) - { - myListOfEltID.clear(); - set::iterator it=myElements.begin(); - for (; it!=myElements.end(); it++) - { - myListOfEltID.push_back((*it)->GetID()); - } - myListOfEltIDIsUpdate = true; - } - return myListOfEltID; + ASSERT( theSubMesh ); + mySubMeshes.insert( theSubMesh ); } //======================================================================= -//function : GetIDNodes +//function : RemoveSubMesh //purpose : //======================================================================= -const vector & SMESHDS_SubMesh::GetIDNodes() + +bool SMESHDS_SubMesh::RemoveSubMesh( const SMESHDS_SubMesh* theSubMesh ) { - if (!myListOfNodeIDIsUpdate) - { - myListOfNodeID.clear(); - set::iterator it=myNodes.begin(); - for (; it!=myNodes.end(); it++) - { - myListOfNodeID.push_back((*it)->GetID()); - } - myListOfNodeIDIsUpdate = true; - } - return myListOfNodeID; + return mySubMeshes.erase( theSubMesh ); +} + +//======================================================================= +//function : ContainsSubMesh +//purpose : +//======================================================================= + +bool SMESHDS_SubMesh::ContainsSubMesh( const SMESHDS_SubMesh* theSubMesh ) const +{ + return mySubMeshes.find( theSubMesh ) != mySubMeshes.end(); +} + +//======================================================================= +//function : GetSubMeshIterator +//purpose : +//======================================================================= + +SMESHDS_SubMeshIteratorPtr SMESHDS_SubMesh::GetSubMeshIterator() const +{ + typedef set::const_iterator TIterator; + return SMESHDS_SubMeshIteratorPtr + ( new SMDS_SetIterator< const SMESHDS_SubMesh*, TIterator >( mySubMeshes.begin(), + mySubMeshes.end())); +} + +//======================================================================= +//function : Clear +//purpose : remove the contents +//======================================================================= + +void SMESHDS_SubMesh::Clear() +{ + myElements.clear(); + myNodes.clear(); + SMESHDS_SubMeshIteratorPtr sub = GetSubMeshIterator(); + while ( sub->more() ) { + if ( SMESHDS_SubMesh* sm = (SMESHDS_SubMesh*) sub->next()) + sm->Clear(); + } }