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

[Everywhere] FileInfo::hasExtension for multiple values (#9774)

Browse Source 
* [Base] Add hasExtension for multiple values

* [Gui] Use hasExtension for multiple values

* [Drawing] Use hasExtension for multiple values

* [Fem] Use hasExtension for multiple values

* [Import] Use hasExtension for multiple values

* [Mesh] Use hasExtension for multiple values

* [Part] Use hasExtension for multiple values

* [TechDraw] Use hasExtension for multiple values
This commit is contained in:
Benjamin Bræstrup Sayoc
2023-08-07 17:55:19 +02:00
committed by GitHub
parent 9587393ca3
commit 33384cff9c
16 changed files with 56 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Mod/Part/App/AppPartPy.cpp
View File

@@ -734,14 +734,14 @@ private:
if (file.extension().empty())
throw Py::RuntimeError("No file extension");
if (file.hasExtension("stp") || file.hasExtension("step")) {
if (file.hasExtension({"stp", "step"})) {
// create new document and add Import feature
App::Document *pcDoc = App::GetApplication().newDocument();
ImportStepParts(pcDoc,EncodedName.c_str());
pcDoc->recompute();
}
else if (file.hasExtension("igs") || file.hasExtension("iges")) {
else if (file.hasExtension({"igs", "iges"})) {
App::Document *pcDoc = App::GetApplication().newDocument();
ImportIgesParts(pcDoc,EncodedName.c_str());
pcDoc->recompute();
@@ -782,12 +782,12 @@ private:
pcDoc = App::GetApplication().newDocument(DocName);
}
if (file.hasExtension("stp") || file.hasExtension("step")) {
if (file.hasExtension({"stp", "step"})) {
ImportStepParts(pcDoc,EncodedName.c_str());
pcDoc->recompute();
}
else if (file.hasExtension("igs") || file.hasExtension("iges")) {
else if (file.hasExtension({"igs", "iges"})) {
ImportIgesParts(pcDoc,EncodedName.c_str());
pcDoc->recompute();
}

12
src/Mod/Part/App/TopoShape.cpp
View File

@@ -693,14 +693,14 @@ void TopoShape::read(const char *FileName)
if (!File.isReadable())
throw Base::FileException("File to load not existing or not readable", FileName);
if (File.hasExtension("igs") || File.hasExtension("iges")) {
if (File.hasExtension({"igs", "iges"})) {
// read iges file
importIges(File.filePath().c_str());
}
else if (File.hasExtension("stp") || File.hasExtension("step")) {
else if (File.hasExtension({"stp", "step"})) {
importStep(File.filePath().c_str());
}
else if (File.hasExtension("brp") || File.hasExtension("brep")) {
else if (File.hasExtension({"brp", "brep"})) {
// read brep-file
importBrep(File.filePath().c_str());
}
@@ -883,14 +883,14 @@ void TopoShape::write(const char *FileName) const
{
Base::FileInfo File(FileName);
if (File.hasExtension("igs") || File.hasExtension("iges")) {
if (File.hasExtension({"igs", "iges"})) {
// write iges file
exportIges(File.filePath().c_str());
}
else if (File.hasExtension("stp") || File.hasExtension("step")) {
else if (File.hasExtension({"stp", "step"})) {
exportStep(File.filePath().c_str());
}
else if (File.hasExtension("brp") || File.hasExtension("brep")) {
else if (File.hasExtension({"brp", "brep"})) {
// read brep-file
exportBrep(File.filePath().c_str());
}