ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-04-04 17:58:26 +05:00
Code Issues Packages Projects Releases Wiki Activity

0021375: EDF 1671 SMESH: Dump study of current state

Browse Source 
+  bool MeshExists( int meshId ) const;
     used to avoid crash at deletion of SMESH_subMesh::myOwnListeners
     at mesh removal
This commit is contained in:
eap 2012-02-09 13:10:52 +00:00
parent d3c66835d0
commit 14e44c7736
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/SMESH/SMESH_Mesh.cxx
View File

@ -170,7 +170,10 @@ SMESH_Mesh::~SMESH_Mesh()
// delete sub-meshes // delete sub-meshes
map <int, SMESH_subMesh*>::iterator sm = _mapSubMesh.begin(); map <int, SMESH_subMesh*>::iterator sm = _mapSubMesh.begin();
for ( ; sm != _mapSubMesh.end(); ++sm ) for ( ; sm != _mapSubMesh.end(); ++sm )
{
delete sm->second; delete sm->second;
sm->second = 0;
}
_mapSubMesh.clear(); _mapSubMesh.clear();
if ( _rmGroupCallUp) delete _rmGroupCallUp; if ( _rmGroupCallUp) delete _rmGroupCallUp;
@ -184,12 +187,24 @@ SMESH_Mesh::~SMESH_Mesh()
} }
if ( _myDocument ) if ( _myDocument )
_myDocument->RemoveMesh( _id ); _myDocument->RemoveMesh( _id );
_myDocument = 0;
if ( _myMeshDS ) if ( _myMeshDS )
// delete _myMeshDS, in a thread in order not to block closing a study with large meshes // delete _myMeshDS, in a thread in order not to block closing a study with large meshes
boost::thread aThread(boost::bind( & deleteMeshDS, _myMeshDS )); boost::thread aThread(boost::bind( & deleteMeshDS, _myMeshDS ));
} }
//================================================================================
/*!
* \brief Return true if a mesh with given id exists
*/
//================================================================================
bool SMESH_Mesh::MeshExists( int meshId ) const
{
return _myDocument ? _myDocument->GetMesh( meshId ) : false;
}
//============================================================================= //=============================================================================
/*! /*!
* \brief Set geometry to be meshed * \brief Set geometry to be meshed

2
src/SMESH/SMESH_Mesh.hxx
View File

@ -147,6 +147,8 @@ public:
int GetId() const { return _id; } int GetId() const { return _id; }
bool MeshExists( int meshId ) const;
SMESHDS_Mesh * GetMeshDS() { return _myMeshDS; } SMESHDS_Mesh * GetMeshDS() { return _myMeshDS; }
const SMESHDS_Mesh * GetMeshDS() const { return _myMeshDS; } const SMESHDS_Mesh * GetMeshDS() const { return _myMeshDS; }