kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Merge pull request #23374 from wwmayer/issue_23353

Browse Source 
Exporting mesh to Z88 format no longer breaks all export and configs
This commit is contained in:
Chris Hennes
2025-08-26 23:20:25 -05:00
committed by GitHub
parent 3814bf1083 e055ce777d
commit 146c84cf1e
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Gui/FileDialog.cpp
View File

@@ -202,11 +202,14 @@ QString FileDialog::getSaveFileName (QWidget * parent, const QString & caption,
QStringList filterSuffixes;
getSuffixesDescription(filterSuffixes, filterToSearch);
QString fiSuffix = QLatin1String("*.") + fi.suffix(); // To match with filterSuffixes
if (fi.suffix().isEmpty() || !filterSuffixes.contains(fiSuffix)) {
const QString fiSuffix = fi.suffix();
const QString dotSuffix = QLatin1String("*.") + fiSuffix; // To match with filterSuffixes
if (fiSuffix.isEmpty() || !filterSuffixes.contains(dotSuffix)) {
// there is no suffix or not a suffix that matches the filter, so
// default to the first suffix of the filter
dirName += filterSuffixes[0].mid(1);
if (!filterSuffixes.isEmpty()) {
dirName += filterSuffixes[0].mid(1);
}
}
}

8
src/Mod/Fem/Init.py
View File

@@ -84,12 +84,10 @@ FreeCAD.addExportType(
"feminout.importYamlJsonMesh",
)
FreeCAD.addImportType("FEM mesh Z88 (*i1.txt *I1.TXT)", "feminout.importZ88Mesh")
FreeCAD.addExportType("FEM mesh Z88 (*i1.txt)", "feminout.importZ88Mesh")
FreeCAD.addImportType("FEM mesh Z88 (*.txt *.TXT)", "feminout.importZ88Mesh")
FreeCAD.addExportType("FEM mesh Z88 (*.txt)", "feminout.importZ88Mesh")
FreeCAD.addImportType(
"FEM result Z88 displacements (*o2.txt *O2.TXT)", "feminout.importZ88O2Results"
)
FreeCAD.addImportType("FEM result Z88 displacements (*.txt *.TXT)", "feminout.importZ88O2Results")
if "BUILD_FEM_VTK" in FreeCAD.__cmake__:
FreeCAD.addImportType(