From: mbs <martin.bernhard@opencascade.com>
Date: Thu, 1 Aug 2024 09:29:35 +0000 (+0100)
Subject: support Gmsh v4.0 output format (requires patch in meshio)
X-Git-Tag: V9_13_0rc2^2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=0e0c07c225e4f408e4a4b9d072d0ef4f495b95e3;p=modules%2Fsmesh.git

support Gmsh v4.0 output format (requires patch in meshio)
---

diff --git a/src/SMESHGUI/SMESHGUI_Meshio.cxx b/src/SMESHGUI/SMESHGUI_Meshio.cxx
index 10fb582c2..49e34becc 100644
--- a/src/SMESHGUI/SMESHGUI_Meshio.cxx
+++ b/src/SMESHGUI/SMESHGUI_Meshio.cxx
@@ -142,12 +142,13 @@ const QStringList& SMESHGUI_Meshio::GetExportFileFilter()
 #endif
     "FLAC3D (*.f3grid)",
     "Gmsh 2.2 (*.msh)",
-    "Gmsh 4.0, and 4.1 (*.msh)",
+    "Gmsh 4.0 (*.msh)",
+    //"Gmsh 4.1 (*.msh)",
     "H5M (*.h5m)",
     "Kratos/MDPA (*.mdpa)",
     "MED/Salome (*.med)",
     "Medit (*.mesh *.meshb)",
-    "Nastran (*.bdf *fem *.nas)",
+    "Nastran (*.bdf *.fem *.nas)",
     "Netgen(*.vol *.vol.gz)",
     "OBJ (*.obj)",
     "OFF (*.off)",
diff --git a/src/SMESH_I/SMESH_Meshio.cxx b/src/SMESH_I/SMESH_Meshio.cxx
index 6e744669f..c1f9717d9 100644
--- a/src/SMESH_I/SMESH_Meshio.cxx
+++ b/src/SMESH_I/SMESH_Meshio.cxx
@@ -365,7 +365,9 @@ QString SMESH_Meshio::GetConvertOptArgs() const
     return "-o ansys";
   else if (mySelectedFilter.startsWith("Gmsh 2"))
     return "-o gmsh22";
-  else if (mySelectedFilter.startsWith("Gmsh 4"))
+  else if (mySelectedFilter.startsWith("Gmsh 4.0"))
+    return "-o gmsh40";
+  else if (mySelectedFilter.startsWith("Gmsh 4.1"))
     return "-o gmsh";
 
   return {};