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

SALOME Forum bug: sub-mesh removal leads to an Exception in a re-opened study.

Browse Source 
Avoid leaks of CORBA objects at calling TPythonDump() << _this()
Avoid leaks of SMESH_MeshEditor_i
This commit is contained in:
eap 2013-07-22 15:25:50 +00:00
parent c9d7623239
commit 60b71b1c6c
2 changed files with 433 additions and 428 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

854
src/SMESH_I/SMESH_Mesh_i.cxx
View File

File diff suppressed because it is too large Load Diff

7
src/SMESH_I/SMESH_Mesh_i.hxx
View File

@ -45,6 +45,7 @@ class SMESH_Gen_i;
class SMESH_GroupBase_i; class SMESH_GroupBase_i;
class SMESH_subMesh_i; class SMESH_subMesh_i;
class SMESH_PreMeshInfo; class SMESH_PreMeshInfo;
class SMESH_MeshEditor_i;
#include <map> #include <map>
@ -655,6 +656,8 @@ private:
std::map<int, SMESH::SMESH_subMesh_ptr> _mapSubMeshIor; std::map<int, SMESH::SMESH_subMesh_ptr> _mapSubMeshIor;
std::map<int, SMESH::SMESH_GroupBase_ptr> _mapGroups; std::map<int, SMESH::SMESH_GroupBase_ptr> _mapGroups;
std::map<int, SMESH::SMESH_Hypothesis_ptr> _mapHypo; std::map<int, SMESH::SMESH_Hypothesis_ptr> _mapHypo;
SMESH_MeshEditor_i* _editor;
SMESH_MeshEditor_i* _previewEditor;
SMESH::MedFileInfo_var _medFileInfo; SMESH::MedFileInfo_var _medFileInfo;
SMESH_PreMeshInfo* _preMeshInfo; // mesh info before full loading from study file SMESH_PreMeshInfo* _preMeshInfo; // mesh info before full loading from study file
@ -669,7 +672,7 @@ private:
// number of items in a group varies (1) <-> (>1) // number of items in a group varies (1) <-> (>1)
std::string _groupEntry; std::string _groupEntry;
std::set<int> _indices; // indices of group items within group's main shape std::set<int> _indices; // indices of group items within group's main shape
CORBA::Object_ptr _smeshObject; // SMESH object depending on GEOM group CORBA::Object_var _smeshObject; // SMESH object depending on GEOM group
}; };
std::list<TGeomGroupData> _geomGroupData; std::list<TGeomGroupData> _geomGroupData;
@ -683,7 +686,7 @@ private:
*/ */
void removeGeomGroupData(CORBA::Object_ptr theSmeshObj); void removeGeomGroupData(CORBA::Object_ptr theSmeshObj);
/*! /*!
* \brief Return new group contents if it has been changed and update group data * Return new group contents if it has been changed and update group data
*/ */
TopoDS_Shape newGroupShape( TGeomGroupData & groupData); TopoDS_Shape newGroupShape( TGeomGroupData & groupData);