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 10fb582c2d578676e56c0e71bfd2c2fe3d24d50e..49e34beccd6422fc22ac39a1319942dbcdeb5a96 100644 (file)
--- 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 6e744669f0573de403ec48b5af05658fb753fb2d..c1f9717d9dc08b781b2014fb9df63914e8180bbb 100644 (file)
--- 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 {};