21948: EDF SMESH : Memory is not freed when deleting a mesh

-        int                  NewMesh(bool theIsEmbeddedMode);
+        SMESHDS_Mesh *       NewMesh(bool theIsEmbeddedMode, int MeshID);

diff --git a/src/SMESHDS/SMESHDS_Document.cxx b/src/SMESHDS/SMESHDS_Document.cxx
index 315275e33ac9f742e6ddc35552229d47e1285a31..ff16aa2b097d703a8930342a9d4167d260e3e499 100644 (file)
--- a/src/SMESHDS/SMESHDS_Document.cxx
+++ b/src/SMESHDS/SMESHDS_Document.cxx
@@ -55,13 +55,15 @@ SMESHDS_Document::~SMESHDS_Document()
 //function : NewMesh
 //purpose  : 
 //=======================================================================
-int SMESHDS_Document::NewMesh(bool theIsEmbeddedMode)
-{
-  static int aNewMeshID = 0;
-  aNewMeshID++;
-  SMESHDS_Mesh *aNewMesh = new SMESHDS_Mesh(aNewMeshID,theIsEmbeddedMode);
-  myMeshes[aNewMeshID] = aNewMesh;
-  return aNewMeshID;
+SMESHDS_Mesh * SMESHDS_Document::NewMesh(bool theIsEmbeddedMode, int MeshID)
+{
+  std::map<int,SMESHDS_Mesh*>::iterator i_m =
+    myMeshes.insert( make_pair( MeshID, (SMESHDS_Mesh*)0 )).first;
+  if ( i_m->second )
+    throw SALOME_Exception("SMESHDS_Document::NewMesh(): ID of existing mesh given");
+  SMESHDS_Mesh *aNewMesh = new SMESHDS_Mesh(MeshID,theIsEmbeddedMode);
+  i_m->second = aNewMesh;
+  return aNewMesh;
 }
 
 //=======================================================================

diff --git a/src/SMESHDS/SMESHDS_Document.hxx b/src/SMESHDS/SMESHDS_Document.hxx
index 4b7f1fcd1bab0a2a1d9fe55eb55eb6c825ec7f67..172b723e2c6ba64d7ae7e5eecb56095ee8525a5d 100644 (file)
--- a/src/SMESHDS/SMESHDS_Document.hxx
+++ b/src/SMESHDS/SMESHDS_Document.hxx
@@ -38,8 +38,8 @@ class SMESHDS_EXPORT SMESHDS_Document
 {
   public:
         SMESHDS_Document(int UserID);
-         ~SMESHDS_Document();
-        int                  NewMesh(bool theIsEmbeddedMode);
+        ~SMESHDS_Document();
+        SMESHDS_Mesh *       NewMesh(bool theIsEmbeddedMode, int MeshID);
         void                 RemoveMesh(int MeshID);
         SMESHDS_Mesh *       GetMesh(int MeshID);
         void                 AddHypothesis(SMESHDS_Hypothesis * H);