ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-25 08:50:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix memory leaks in SMESHGUI_Displayer::canBeDisplayed()

Browse Source
This commit is contained in:
eap 2020-08-10 17:16:36 +03:00
parent 9d1d5827c6
commit 6c91402a6f
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/SMESHGUI/SMESHGUI_Displayer.cxx
View File

@ -89,7 +89,8 @@ SalomeApp_Study* SMESHGUI_Displayer::study() const
return dynamic_cast<SalomeApp_Study*>( myApp->activeStudy() ); return dynamic_cast<SalomeApp_Study*>( myApp->activeStudy() );
} }
bool SMESHGUI_Displayer::canBeDisplayed( const QString& entry, const QString& viewer_type ) const { bool SMESHGUI_Displayer::canBeDisplayed( const QString& entry, const QString& viewer_type ) const
{
bool res = false; bool res = false;
if(viewer_type != SVTK_Viewer::Type()) if(viewer_type != SVTK_Viewer::Type())
return res; return res;
@ -97,25 +98,18 @@ bool SMESHGUI_Displayer::canBeDisplayed( const QString& entry, const QString& vi
_PTR(SObject) obj = SMESH::getStudy()->FindObjectID( (const char*)entry.toUtf8() ); _PTR(SObject) obj = SMESH::getStudy()->FindObjectID( (const char*)entry.toUtf8() );
CORBA::Object_var anObj = SMESH::SObjectToObject( obj ); CORBA::Object_var anObj = SMESH::SObjectToObject( obj );
/* if ( !CORBA::is_nil( anObj ) )
if( !CORBA::is_nil( anObj ) ) { {
SMESH::SMESH_Mesh_var mesh = SMESH::SMESH_Mesh::_narrow( anObj ); SMESH::SMESH_Mesh_var mesh = SMESH::SMESH_Mesh::_narrow( anObj );
if ( ! mesh->_is_nil() ) if ( ! ( res = !mesh->_is_nil() ))
res = (mesh->NbNodes() > 0); {
SMESH::SMESH_subMesh_var aSubMeshObj = SMESH::SMESH_subMesh::_narrow( anObj );
SMESH::SMESH_subMesh_var aSubMeshObj = SMESH::SMESH_subMesh::_narrow( anObj ); if ( ! ( res = !aSubMeshObj->_is_nil() ))
if ( !aSubMeshObj->_is_nil() ) {
res = (aSubMeshObj->GetNumberOfNodes(true) > 0); SMESH::SMESH_GroupBase_var aGroupObj = SMESH::SMESH_GroupBase::_narrow( anObj );
res = !aGroupObj->_is_nil();
SMESH::SMESH_GroupBase_var aGroupObj = SMESH::SMESH_GroupBase::_narrow( anObj ); }
if ( !aGroupObj->_is_nil() ) }
res = !aGroupObj->IsEmpty();
}*/
if( !CORBA::is_nil( anObj ) ) {
if(!SMESH::SMESH_Mesh::_narrow( anObj )->_is_nil() ||
!SMESH::SMESH_subMesh::_narrow( anObj )->_is_nil() ||
!SMESH::SMESH_GroupBase::_narrow( anObj )->_is_nil())
res = true;
} }
return res; return res;
} }