Merge branch 'master' into V7_5_BR

[modules/smesh.git] / src / SMESHDS / SMESHDS_Document.cxx

diff --git a/src/SMESHDS/SMESHDS_Document.cxx b/src/SMESHDS/SMESHDS_Document.cxx
index 315275e33ac9f742e6ddc35552229d47e1285a31..93fbc5ec0768e919dacffe3f66cfccc2faba5c50 100644 (file)
--- a/src/SMESHDS/SMESHDS_Document.cxx
+++ b/src/SMESHDS/SMESHDS_Document.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  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
@@ -6,7 +6,7 @@
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -55,13 +55,15 @@ SMESHDS_Document::~SMESHDS_Document()
 //function : NewMesh
 //purpose  : 
 //=======================================================================
-int SMESHDS_Document::NewMesh(bool theIsEmbeddedMode)
+SMESHDS_Mesh * SMESHDS_Document::NewMesh(bool theIsEmbeddedMode, int MeshID)
 {
-  static int aNewMeshID = 0;
-  aNewMeshID++;
-  SMESHDS_Mesh *aNewMesh = new SMESHDS_Mesh(aNewMeshID,theIsEmbeddedMode);
-  myMeshes[aNewMeshID] = aNewMesh;
-  return aNewMeshID;
+  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;
 }
 
 //=======================================================================