X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHDS%2FSMESHDS_SubMesh.cxx;h=127c5c2d99ccd100786b66dd0e3c858ab40f4574;hp=fab9fba9c8233b32d694b05001af1c62dd31ad69;hb=0635c9fc80f67d1e5dc0e94ec85f487286a92070;hpb=bef9beee88cac57394b8dc3bc914381c1a2fff83 diff --git a/src/SMESHDS/SMESHDS_SubMesh.cxx b/src/SMESHDS/SMESHDS_SubMesh.cxx index fab9fba9c..127c5c2d9 100644 --- a/src/SMESHDS/SMESHDS_SubMesh.cxx +++ b/src/SMESHDS/SMESHDS_SubMesh.cxx @@ -1,128 +1,328 @@ -using namespace std; -//============================================================================= -// File : SMESH_SubMesh.cxx -// Created : -// Author : Yves FRICAUD, OCC -// Project : SALOME -// Copyright : OCC 2002 -// $Header: -//============================================================================= +// 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. +// +// 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: +// +#include "SMESHDS_SubMesh.hxx" -#include "SMESHDS_SubMesh.ixx" -#include "SMDS_MapIteratorOfExtendedMap.hxx" +#include "utilities.h" +#include "SMDS_SetIterator.hxx" -//======================================================================= -//function : SMESHDS_SubMesh -//purpose : -//======================================================================= -SMESHDS_SubMesh::SMESHDS_SubMesh(const Handle(SMDS_Mesh)& M) : myMesh(M) -{ - myListOfEltIDIsUpdate = Standard_False; - myListOfNodeIDIsUpdate = Standard_False; -} +using namespace std; //======================================================================= //function : AddElement //purpose : //======================================================================= -void SMESHDS_SubMesh::AddElement (const Handle(SMDS_MeshElement)& ME) +void SMESHDS_SubMesh::AddElement(const SMDS_MeshElement * ME) { - myElements.Add(ME); - myListOfEltIDIsUpdate = Standard_False; + if ( !IsComplexSubmesh() ) + myElements.insert(ME); } //======================================================================= //function : RemoveElement //purpose : //======================================================================= -void SMESHDS_SubMesh::RemoveElement(const Handle(SMDS_MeshElement)& ME) +bool SMESHDS_SubMesh::RemoveElement(const SMDS_MeshElement * ME) { - myElements.Remove(ME); - myListOfEltIDIsUpdate = Standard_False; + if ( !IsComplexSubmesh() && NbElements() ) + return myElements.erase(ME); + + return false; } + //======================================================================= //function : AddNode //purpose : //======================================================================= -void SMESHDS_SubMesh::AddNode (const Handle(SMDS_MeshNode)& N) +void SMESHDS_SubMesh::AddNode(const SMDS_MeshNode * N) { - myNodes.Add(N); - myListOfNodeIDIsUpdate = Standard_False; + if ( !IsComplexSubmesh() ) + myNodes.insert(N); } //======================================================================= //function : RemoveNode //purpose : //======================================================================= -void SMESHDS_SubMesh::RemoveNode (const Handle(SMDS_MeshNode)& N) + +bool SMESHDS_SubMesh::RemoveNode(const SMDS_MeshNode * N) { - myNodes.Remove(N); - myListOfNodeIDIsUpdate = Standard_False; + if ( !IsComplexSubmesh() && NbNodes() ) + return myNodes.erase(N); + + return false; } //======================================================================= //function : NbElements //purpose : //======================================================================= -Standard_Integer SMESHDS_SubMesh::NbElements() +int SMESHDS_SubMesh::NbElements() const { - return myElements.Extent(); + if ( !IsComplexSubmesh() ) + return myElements.size(); + + int nbElems = 0; +#ifndef WNT + set::iterator it = mySubMeshes.begin(); +#else + set::const_iterator it = mySubMeshes.begin(); +#endif + for ( ; it != mySubMeshes.end(); it++ ) + nbElems += (*it)->NbElements(); + + return nbElems; } //======================================================================= -//function : GetElements +//function : NbNodes //purpose : //======================================================================= -const SMDS_MapOfMeshElement& SMESHDS_SubMesh::GetElements() + +int SMESHDS_SubMesh::NbNodes() const { - return myElements; + if ( !IsComplexSubmesh() ) + return myNodes.size(); + + int nbElems = 0; +#ifndef WNT + set::iterator it = mySubMeshes.begin(); +#else + set::const_iterator it = mySubMeshes.begin(); +#endif + for ( ; it != mySubMeshes.end(); it++ ) + nbElems += (*it)->NbNodes(); + + return nbElems; } + +// ===================== +// class MySetIterator +// ===================== + +template class MySetIterator:public SMDS_Iterator +{ + typedef const set TSet; + typename TSet::const_iterator myIt; + TSet& mySet; + + public: + MySetIterator(const set& s):mySet(s), myIt(s.begin()) + { + } + + bool more() + { + return myIt!=mySet.end(); + } + const T* next() + { + const T* t=*myIt; + myIt++; + return t; + } +}; + +// ===================== +// class MyIterator +// ===================== + +template class MyIterator : public SMDS_Iterator +{ + public: + MyIterator (const set& theSubMeshes) + : mySubMeshes( theSubMeshes ), mySubIt( theSubMeshes.begin() ), myMore(false) + {} + bool more() + { + while (( !myElemIt.get() || !myElemIt->more() ) && + mySubIt != mySubMeshes.end()) + { + 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; + const set& mySubMeshes; + set::const_iterator mySubIt; + 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 : //======================================================================= -Standard_Integer SMESHDS_SubMesh::NbNodes() + +SMDS_ElemIteratorPtr SMESHDS_SubMesh::GetElements() const { - return myNodes.Extent(); + if ( IsComplexSubmesh() ) + return SMDS_ElemIteratorPtr( new MyElemIterator( mySubMeshes )); + + return SMDS_ElemIteratorPtr(new MySetIterator(myElements)); } //======================================================================= //function : GetNodes //purpose : //======================================================================= -const SMDS_MapOfMeshElement& SMESHDS_SubMesh::GetNodes() + +SMDS_NodeIteratorPtr SMESHDS_SubMesh::GetNodes() const { - return myNodes; + if ( IsComplexSubmesh() ) + return SMDS_NodeIteratorPtr( new MyNodeIterator( mySubMeshes )); + + return SMDS_NodeIteratorPtr(new MySetIterator(myNodes)); } //======================================================================= -//function : GetIDElements -//purpose : +//function : Contains +//purpose : check if elem or node is in //======================================================================= -const TColStd_ListOfInteger& SMESHDS_SubMesh::GetIDElements() + +bool SMESHDS_SubMesh::Contains(const SMDS_MeshElement * ME) const { - if (!myListOfEltIDIsUpdate) { - myListOfEltID.Clear(); - for (SMDS_MapIteratorOfExtendedMap it(myElements); it.More(); it.Next()) { - myListOfEltID.Append(it.Key()->GetID()); - } - myListOfEltIDIsUpdate = Standard_True; + // DO NOT TRY TO FIND A REMOVED ELEMENT !! + 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 ) + { + const SMDS_MeshNode* n = static_cast( ME ); + return ( myNodes.find( n ) != myNodes.end() ); } - return myListOfEltID; + + return ( myElements.find( ME ) != myElements.end() ); } //======================================================================= -//function : GetIDNodes +//function : AddSubMesh //purpose : //======================================================================= -const TColStd_ListOfInteger& SMESHDS_SubMesh::GetIDNodes() + +void SMESHDS_SubMesh::AddSubMesh( const SMESHDS_SubMesh* theSubMesh ) { - if (!myListOfNodeIDIsUpdate) { - myListOfNodeID.Clear(); - for (SMDS_MapIteratorOfExtendedMap it(myNodes); it.More(); it.Next()) { - myListOfNodeID.Append(it.Key()->GetID()); - } - myListOfNodeIDIsUpdate = Standard_True; + ASSERT( theSubMesh ); + mySubMeshes.insert( theSubMesh ); +} + +//======================================================================= +//function : RemoveSubMesh +//purpose : +//======================================================================= + +bool SMESHDS_SubMesh::RemoveSubMesh( const SMESHDS_SubMesh* theSubMesh ) +{ + 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(); } - return myListOfNodeID; }