-// 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:
-
+//
#include "SMESHDS_SubMesh.hxx"
#include "utilities.h"
+#include "SMDS_SetIterator.hxx"
using namespace std;
//function : RemoveElement
//purpose :
//=======================================================================
-bool SMESHDS_SubMesh::RemoveElement(const SMDS_MeshElement * ME)
+bool SMESHDS_SubMesh::RemoveElement(const SMDS_MeshElement * ME, bool isElemDeleted)
{
- if ( !IsComplexSubmesh() && NbElements() )
- return myElements.erase(ME);
+ 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;
}
//purpose :
//=======================================================================
-bool SMESHDS_SubMesh::RemoveNode(const SMDS_MeshNode * N)
+bool SMESHDS_SubMesh::RemoveNode(const SMDS_MeshNode * N, bool isNodeDeleted)
{
- if ( !IsComplexSubmesh() && NbNodes() )
- return myNodes.erase(N);
+ 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;
}
return myElements.size();
int nbElems = 0;
- set<const SMESHDS_SubMesh*>::iterator it = mySubMeshes.begin();
+ set<const SMESHDS_SubMesh*>::const_iterator it = mySubMeshes.begin();
for ( ; it != mySubMeshes.end(); it++ )
nbElems += (*it)->NbElements();
return myNodes.size();
int nbElems = 0;
- set<const SMESHDS_SubMesh*>::iterator it = mySubMeshes.begin();
+ set<const SMESHDS_SubMesh*>::const_iterator it = mySubMeshes.begin();
for ( ; it != mySubMeshes.end(); it++ )
nbElems += (*it)->NbNodes();
// class MySetIterator
// =====================
-template<typename T> class MySetIterator:public SMDS_Iterator<const T*>
+template<class ELEM, typename TSET> class MySetIterator:
+ public SMDS_SetIterator<ELEM, typename TSET::const_iterator >
{
- typedef const set<const T*> TSet;
- typename TSet::const_iterator myIt;
- TSet& mySet;
-
+ typedef SMDS_SetIterator<ELEM, typename TSET::const_iterator > TFather;
public:
- MySetIterator(const set<const T*>& s):mySet(s), myIt(s.begin())
- {
- }
-
- bool more()
+ MySetIterator(const TSET& s):TFather(s.begin(),s.end())
{
- return myIt!=mySet.end();
- }
- const T* next()
- {
- const T* t=*myIt;
- myIt++;
- return t;
}
};
{
public:
MyIterator (const set<const SMESHDS_SubMesh*>& theSubMeshes)
- : mySubMeshes( theSubMeshes ), mySubIt( theSubMeshes.begin() ), myMore(false)
+ : mySubIt( theSubMeshes.begin() ), mySubEnd( theSubMeshes.end() ), myMore(false)
{}
bool more()
{
- while (( !myElemIt.get() || !myElemIt->more() ) &&
- mySubIt != mySubMeshes.end())
+ while (( !myElemIt.get() || !myElemIt->more() ) && mySubIt != mySubEnd)
{
myElemIt = getElements(*mySubIt);
mySubIt++;
private:
bool myMore;
- const set<const SMESHDS_SubMesh*>& mySubMeshes;
- set<const SMESHDS_SubMesh*>::const_iterator mySubIt;
+ set<const SMESHDS_SubMesh*>::const_iterator mySubIt, mySubEnd;
boost::shared_ptr< SMDS_Iterator<VALUE> > myElemIt;
};
if ( IsComplexSubmesh() )
return SMDS_ElemIteratorPtr( new MyElemIterator( mySubMeshes ));
- return SMDS_ElemIteratorPtr(new MySetIterator<SMDS_MeshElement>(myElements));
+ return SMDS_ElemIteratorPtr(new MySetIterator<const SMDS_MeshElement*,TElemSet>(myElements));
}
//=======================================================================
if ( IsComplexSubmesh() )
return SMDS_NodeIteratorPtr( new MyNodeIterator( mySubMeshes ));
- return SMDS_NodeIteratorPtr(new MySetIterator<SMDS_MeshNode>(myNodes));
+ return SMDS_NodeIteratorPtr(new MySetIterator<const SMDS_MeshNode*,TElemSet>(myNodes));
}
//=======================================================================
bool SMESHDS_SubMesh::Contains(const SMDS_MeshElement * ME) const
{
// DO NOT TRY TO FIND A REMOVED ELEMENT !!
- if ( !ME )
+ //if ( IsComplexSubmesh() || !ME )
+ if (!ME )
return false;
if ( IsComplexSubmesh() )
}
if ( ME->GetType() == SMDSAbs_Node )
- {
- const SMDS_MeshNode* n = static_cast<const SMDS_MeshNode*>( ME );
- return ( myNodes.find( n ) != myNodes.end() );
- }
+ return ( myNodes.find( ME ) != myNodes.end() );
return ( myElements.find( ME ) != myElements.end() );
}
{
return mySubMeshes.find( theSubMesh ) != mySubMeshes.end();
}
+
+//=======================================================================
+//function : GetSubMeshIterator
+//purpose :
+//=======================================================================
+
+SMESHDS_SubMeshIteratorPtr SMESHDS_SubMesh::GetSubMeshIterator() const
+{
+ typedef set<const SMESHDS_SubMesh*>::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();
+ }
+}
