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

BIM: more tests in IfcOpenShell tool - fixes #15147

Browse Source
This commit is contained in:
Yorik van Havre
2024-07-08 15:13:19 +02:00
committed by Yorik van Havre
parent 4e9e0f4111
commit 8a0604c491
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/Mod/BIM/nativeifc/ifc_openshell.py
View File

@@ -47,14 +47,20 @@ class IFC_UpdateIOS:
version = self.get_current_version()
avail = self.get_avail_version()
if version:
comp = self.compare_versions(avail, version)
if comp > 0:
self.show_dialog("update", avail)
if avail:
if version:
comp = self.compare_versions(avail, version)
if comp > 0:
self.show_dialog("update", avail)
else:
self.show_dialog("uptodate")
else:
self.show_dialog("uptodate")
self.show_dialog("install", avail)
else:
self.show_dialog("install", avail)
if version:
self.show_dialog("uptodate")
else:
self.show_dialog("failed")
def show_dialog(self, mode, version=None):
@@ -78,6 +84,9 @@ class IFC_UpdateIOS:
text += translate("BIM", "Would you like to install the most recent version?")
text += " (" + version + ") " + note
buttons = QtGui.QMessageBox.Cancel | QtGui.QMessageBox.Ok
elif mode == "failed":
text = translate("BIM", "IfcOpenShell is not installed, and FreeCAD failed to find a suitable version to install. You can still install IfcOpenShell manually, visit https://wiki.freecad.org/IfcOpenShell for further instructions.")
buttons = QtGui.QMessageBox.Ok
reply = QtGui.QMessageBox.information(None, title, text, buttons)
if reply == QtGui.QMessageBox.Ok:
if mode in ["update", "install"]:
@@ -142,10 +151,12 @@ class IFC_UpdateIOS:
result = self.run_pip(["index", "versions", "ifcopenshell"])
if result:
result = result.stdout.split()
result = result[result.index("versions:")+1:]
result = [r.strip(",") for r in result]
return result[0] # we return the biggest
if result.stdout and "versions" in result.stdout:
result = result.stdout.split()
result = result[result.index("versions:")+1:]
result = [r.strip(",") for r in result]
return result[0] # we return the biggest
return None
def compare_versions(self, v1, v2):