From 69828c26628f66ac2ca80c0cc9f7a9b58ff2d89a Mon Sep 17 00:00:00 2001 From: looooo Date: Wed, 1 Mar 2017 17:12:49 +0100 Subject: [PATCH] py3: Part: BOPTools: to make the BOPTools available in python3 the way to import these tools had to be changed: old: ```from Part import BOPTools``` -> new: ```import BOPTools``` this is also changed for python2 --- src/Mod/Part/BOPTools/JoinFeatures.py | 8 ++++---- src/Mod/Part/BOPTools/SplitFeatures.py | 12 ++++++------ src/Mod/Part/InitGui.py | 7 ++++--- src/Mod/Part/JoinFeatures.py | 4 ++-- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/Mod/Part/BOPTools/JoinFeatures.py b/src/Mod/Part/BOPTools/JoinFeatures.py index 91b41fbb5..eea36bf17 100644 --- a/src/Mod/Part/BOPTools/JoinFeatures.py +++ b/src/Mod/Part/BOPTools/JoinFeatures.py @@ -83,7 +83,7 @@ def cmdCreateJoinFeature(name, mode): mb = QtGui.QMessageBox() mb.setIcon(mb.Icon.Warning) mb.setText(_translate("Part_JoinFeatures","Computing the result failed with an error: \n\n{err}\n\n Click 'Continue' to create the feature anyway, or 'Abort' to cancel.", None) - .format(err= err.message)) + .format(err= str(err))) mb.setWindowTitle(_translate("Part_JoinFeatures","Bad selection", None)) btnAbort = mb.addButton(QtGui.QMessageBox.StandardButton.Abort) btnOK = mb.addButton(_translate("Part_JoinFeatures","Continue",None), QtGui.QMessageBox.ButtonRole.ActionRole) @@ -167,7 +167,7 @@ class ViewProviderConnect: for obj in self.claimChildren(): obj.ViewObject.show() except Exception as err: - FreeCAD.Console.PrintError("Error in onDelete: " + err.message) + FreeCAD.Console.PrintError("Error in onDelete: " + str(err)) return True class CommandConnect: @@ -261,7 +261,7 @@ class ViewProviderEmbed: self.Object.Base.ViewObject.show() self.Object.Tool.ViewObject.show() except Exception as err: - FreeCAD.Console.PrintError("Error in onDelete: " + err.message) + FreeCAD.Console.PrintError("Error in onDelete: " + str(err)) return True class CommandEmbed: @@ -356,7 +356,7 @@ class ViewProviderCutout: self.Object.Base.ViewObject.show() self.Object.Tool.ViewObject.show() except Exception as err: - FreeCAD.Console.PrintError("Error in onDelete: " + err.message) + FreeCAD.Console.PrintError("Error in onDelete: " + str(err)) return True diff --git a/src/Mod/Part/BOPTools/SplitFeatures.py b/src/Mod/Part/BOPTools/SplitFeatures.py index 1d639c72a..4c326b431 100644 --- a/src/Mod/Part/BOPTools/SplitFeatures.py +++ b/src/Mod/Part/BOPTools/SplitFeatures.py @@ -119,7 +119,7 @@ class ViewProviderBooleanFragments: for obj in self.claimChildren(): obj.ViewObject.show() except Exception as err: - FreeCAD.Console.PrintError("Error in onDelete: " + err.message) + FreeCAD.Console.PrintError("Error in onDelete: " + str(err)) return True def cmdCreateBooleanFragmentsFeature(name, mode): @@ -141,7 +141,7 @@ def cmdCreateBooleanFragmentsFeature(name, mode): mb = QtGui.QMessageBox() mb.setIcon(mb.Icon.Warning) mb.setText(_translate("Part_SplitFeatures","Computing the result failed with an error: \n\n{err}\n\nClick 'Continue' to create the feature anyway, or 'Abort' to cancel.", None) - .format(err= err.message)) + .format(err= str(err))) mb.setWindowTitle(_translate("Part_SplitFeatures","Bad selection", None)) btnAbort = mb.addButton(QtGui.QMessageBox.StandardButton.Abort) btnOK = mb.addButton(_translate("Part_SplitFeatures","Continue",None), QtGui.QMessageBox.ButtonRole.ActionRole) @@ -246,7 +246,7 @@ class ViewProviderSlice: for obj in self.claimChildren(): obj.ViewObject.show() except Exception as err: - FreeCAD.Console.PrintError("Error in onDelete: " + err.message) + FreeCAD.Console.PrintError("Error in onDelete: " + str(err)) return True def cmdCreateSliceFeature(name, mode): @@ -269,7 +269,7 @@ def cmdCreateSliceFeature(name, mode): mb = QtGui.QMessageBox() mb.setIcon(mb.Icon.Warning) mb.setText(_translate("Part_SplitFeatures","Computing the result failed with an error: \n\n{err}\n\nClick 'Continue' to create the feature anyway, or 'Abort' to cancel.", None) - .format(err= err.message)) + .format(err= str(err))) mb.setWindowTitle(_translate("Part_SplitFeatures","Bad selection", None)) btnAbort = mb.addButton(QtGui.QMessageBox.StandardButton.Abort) btnOK = mb.addButton(_translate("Part_SplitFeatures","Continue",None), QtGui.QMessageBox.ButtonRole.ActionRole) @@ -374,7 +374,7 @@ class ViewProviderXOR: for obj in self.claimChildren(): obj.ViewObject.show() except Exception as err: - FreeCAD.Console.PrintError("Error in onDelete: " + err.message) + FreeCAD.Console.PrintError("Error in onDelete: " + str(err)) return True def cmdCreateXORFeature(name): @@ -395,7 +395,7 @@ def cmdCreateXORFeature(name): mb = QtGui.QMessageBox() mb.setIcon(mb.Icon.Warning) mb.setText(_translate("Part_SplitFeatures","Computing the result failed with an error: \n\n{err}\n\nClick 'Continue' to create the feature anyway, or 'Abort' to cancel.", None) - .format(err= err.message)) + .format(err= str(err))) mb.setWindowTitle(_translate("Part_SplitFeatures","Bad selection", None)) btnAbort = mb.addButton(QtGui.QMessageBox.StandardButton.Abort) btnOK = mb.addButton(_translate("Part_SplitFeatures","Continue",None), QtGui.QMessageBox.ButtonRole.ActionRole) diff --git a/src/Mod/Part/InitGui.py b/src/Mod/Part/InitGui.py index 1d4989448..0bed950fb 100644 --- a/src/Mod/Part/InitGui.py +++ b/src/Mod/Part/InitGui.py @@ -41,14 +41,15 @@ class PartWorkbench ( Workbench ): def Initialize(self): # load the module import PartGui - import Part + import BOPTools import CompoundTools._CommandCompoundFilter try: - Part.BOPTools.addCommands() + BOPTools.importAll() + BOPTools.addCommands() except Exception as err: - FreeCAD.Console.PrintError("Features from BOPTools package cannot be loaded. {err}\n".format(err= err.message)) + FreeCAD.Console.PrintError("Features from BOPTools package cannot be loaded. {err}\n".format(err= str(err))) def GetClassName(self): return "PartGui::Workbench" diff --git a/src/Mod/Part/JoinFeatures.py b/src/Mod/Part/JoinFeatures.py index 06046efa0..ffa74492b 100644 --- a/src/Mod/Part/JoinFeatures.py +++ b/src/Mod/Part/JoinFeatures.py @@ -158,7 +158,7 @@ class _ViewProviderPartJoinFeature: self.Object.Base.ViewObject.show() self.Object.Tool.ViewObject.show() except Exception as err: - FreeCAD.Console.PrintError("Error in onDelete: " + err.message) + FreeCAD.Console.PrintError("Error in onDelete: " + str(err)) return True # @@ -176,7 +176,7 @@ class _ViewProviderPartJoinFeature: # mb = QtGui.QMessageBox() # mb.setIcon(mb.Icon.Warning) # mb.setText(_translate("Part_JoinFeatures","Computing the result failed with an error: {err}. Click 'Continue' to create the feature anyway, or 'Abort' to cancel.", None) -# .format(err= err.message)) +# .format(err= str(err))) # mb.setWindowTitle(_translate("Part_JoinFeatures","Bad selection", None)) # btnAbort = mb.addButton(QtGui.QMessageBox.StandardButton.Abort) # btnOK = mb.addButton(_translate("Part_JoinFeatures","Continue",None), QtGui.QMessageBox.ButtonRole.ActionRole)