From: Paul RASCLE <paul.rascle@edf.fr>
Date: Wed, 10 Oct 2018 11:51:29 +0000 (+0200)
Subject: Merge branch 'master' into pre/medCompatibility
X-Git-Tag: V9_2_0a2~12
X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=commitdiff_plain;h=a63fc78c25199b018fae4f5b182e6a348be0abf2;hp=-c

Merge branch 'master' into pre/medCompatibility
---

a63fc78c25199b018fae4f5b182e6a348be0abf2
diff --combined src/SMESH/SMESH_Mesh.cxx
index 2a19d6e73,226800af2..4e7368ab6
--- a/src/SMESH/SMESH_Mesh.cxx
+++ b/src/SMESH/SMESH_Mesh.cxx
@@@ -361,6 -361,7 +361,7 @@@ double SMESH_Mesh::GetShapeDiagonalSize
      bool isPrecise = false;
      if ( nbFaces < maxNbFaces )
        try {
+         OCC_CATCH_SIGNALS;
          GEOMUtils::PreciseBoundingBox( aShape, Box );
          isPrecise = true;
        }
@@@ -1421,18 -1422,18 +1422,18 @@@ bool SMESH_Mesh::HasDuplicatedGroupName
  void SMESH_Mesh::ExportMED(const char *        file, 
                             const char*         theMeshName, 
                             bool                theAutoGroups,
 -                           int                 theMinor,
 +                           int                 theVersion,
                             const SMESHDS_Mesh* meshPart,
                             bool                theAutoDimension,
                             bool                theAddODOnVertices,
                             bool                theAllElemsToGroup)
    throw(SALOME_Exception)
  {
 -  //MESSAGE("MED_VERSION:"<< theVersion);
 +  MESSAGE("MED_VERSION:"<< theVersion);
    SMESH_TRY;
  
    DriverMED_W_SMESHDS_Mesh myWriter;
 -  myWriter.SetFile         ( file , theMinor);
 +  myWriter.SetFile         ( file , theVersion);
    myWriter.SetMesh         ( meshPart ? (SMESHDS_Mesh*) meshPart : _myMeshDS   );
    myWriter.SetAutoDimension( theAutoDimension );
    myWriter.AddODOnVertices ( theAddODOnVertices );