-// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016 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
//=======================================================================
//function : AddNode
-//purpose :
+//purpose :
//=======================================================================
void SMESHDS_SubMesh::AddNode(const SMDS_MeshNode * N)
//=======================================================================
//function : NbNodes
-//purpose :
+//purpose :
//=======================================================================
int SMESHDS_SubMesh::NbNodes() const
template<typename VALUE> class MyIterator : public SMDS_Iterator<VALUE>
{
- public:
+public:
MyIterator (const set<const SMESHDS_SubMesh*>& theSubMeshes)
: myMore(false), mySubIt( theSubMeshes.begin() ), mySubEnd( theSubMeshes.end() )
- {}
+ {}
bool more()
{
while (( !myElemIt.get() || !myElemIt->more() ) && mySubIt != mySubEnd)
elem = myElemIt->next();
return elem;
}
- protected:
+protected:
virtual boost::shared_ptr< SMDS_Iterator<VALUE> >
- getElements(const SMESHDS_SubMesh*) const = 0;
+ getElements(const SMESHDS_SubMesh*) const = 0;
- private:
+private:
bool myMore;
set<const SMESHDS_SubMesh*>::const_iterator mySubIt, mySubEnd;
boost::shared_ptr< SMDS_Iterator<VALUE> > myElemIt;
class MyElemIterator: public MyIterator<const SMDS_MeshElement*>
{
- public:
+public:
MyElemIterator (const set<const SMESHDS_SubMesh*>& theSubMeshes)
:MyIterator<const SMDS_MeshElement*>( theSubMeshes ) {}
SMDS_ElemIteratorPtr getElements(const SMESHDS_SubMesh* theSubMesh) const
class MyNodeIterator: public MyIterator<const SMDS_MeshNode*>
{
- public:
+public:
MyNodeIterator (const set<const SMESHDS_SubMesh*>& theSubMeshes)
:MyIterator<const SMDS_MeshNode*>( theSubMeshes ) {}
SMDS_NodeIteratorPtr getElements(const SMESHDS_SubMesh* theSubMesh) const
{ return theSubMesh->GetNodes(); }
};
-
+
//=======================================================================
//function : GetElements
-//purpose :
+//purpose :
//=======================================================================
SMDS_ElemIteratorPtr SMESHDS_SubMesh::GetElements() const
{
if ( IsComplexSubmesh() )
return SMDS_ElemIteratorPtr( new MyElemIterator( mySubMeshes ));
- return SMDS_ElemIteratorPtr(new MySetIterator<const SMDS_MeshElement*, std::vector<const SMDS_MeshElement*> >(myElements));
+
+ return SMDS_ElemIteratorPtr
+ (new MySetIterator<const SMDS_MeshElement*, std::vector<const SMDS_MeshElement*> >(myElements));
}
//=======================================================================
//function : GetNodes
-//purpose :
+//purpose :
//=======================================================================
SMDS_NodeIteratorPtr SMESHDS_SubMesh::GetNodes() const
if ( IsComplexSubmesh() )
return SMDS_NodeIteratorPtr( new MyNodeIterator( mySubMeshes ));
- return SMDS_NodeIteratorPtr(new MySetIterator<const SMDS_MeshNode*, std::vector<const SMDS_MeshNode*> >(myNodes));
+ return SMDS_NodeIteratorPtr
+ (new MySetIterator<const SMDS_MeshNode*, std::vector<const SMDS_MeshNode*> >(myNodes));
}
//=======================================================================
//=======================================================================
//function : AddSubMesh
-//purpose :
+//purpose :
//=======================================================================
void SMESHDS_SubMesh::AddSubMesh( const SMESHDS_SubMesh* theSubMesh )
void SMESHDS_SubMesh::Clear()
{
+ if ( myParent && myParent->NbNodes() > 0 )
+ {
+ for ( size_t i = 0; i < myElements.size(); ++i )
+ {
+ if ( myElements[i] &&
+ myElements[i]->GetID() > 0 &&
+ myElements[i] == myParent->FindElement( myElements[i]->GetID() )) // not deleted
+ const_cast< SMDS_MeshElement* >( myElements[i] )->setShapeId( 0 );
+ }
+ for ( size_t i = 0; i < myNodes.size(); ++i )
+ {
+ if ( myNodes[i] &&
+ myNodes[i]->GetID() > 0 &&
+ myNodes[i] == myParent->FindNode( myNodes[i]->GetID() )) // not deleted
+ const_cast< SMDS_MeshNode* >( myNodes[i] )->setShapeId( 0 );
+ }
+ }
+
clearVector( myElements );
clearVector( myNodes );
myUnusedIdNodes = 0;
{
std::vector<const SMDS_MeshElement*> newElems;
newElems.reserve( myElements.size() - myUnusedIdElements );
- for (size_t i = 0; i < myElements.size(); i++)
- if (myElements[i])
+ for ( size_t i = 0; i < myElements.size(); i++)
+ if ( myElements[i] )
{
SMDS_MeshElement* elem = (SMDS_MeshElement*)myElements[i];
- elem->setIdInShape(newElems.size());
- newElems.push_back(elem);
+ elem->setIdInShape( newElems.size() );
+ newElems.push_back( elem );
}
myElements.swap(newElems);
myUnusedIdElements = 0;
{
std::vector<const SMDS_MeshNode*> newNodes;
newNodes.reserve( myNodes.size() - myUnusedIdNodes );
- for (size_t i = 0; i < myNodes.size(); i++)
- if (myNodes[i])
+ for ( size_t i = 0; i < myNodes.size(); i++ )
+ if ( myNodes[i] )
{
SMDS_MeshNode* node = (SMDS_MeshNode*)myNodes[i];
- node->setIdInShape(newNodes.size());
- newNodes.push_back(node);
+ node->setIdInShape( newNodes.size() );
+ newNodes.push_back( node );
}
myNodes.swap(newNodes);
myUnusedIdNodes = 0;