suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

py3: Part: BOPTools:

Browse Source 
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
This commit is contained in:
looooo 2017-03-01 17:12:49 +01:00
parent a388a9d72d
commit 69828c2662
4 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Mod/Part/BOPTools/JoinFeatures.py
View File

@ -83,7 +83,7 @@ def cmdCreateJoinFeature(name, mode):
mb = QtGui.QMessageBox() mb = QtGui.QMessageBox()
mb.setIcon(mb.Icon.Warning) 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) 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)) mb.setWindowTitle(_translate("Part_JoinFeatures","Bad selection", None))
btnAbort = mb.addButton(QtGui.QMessageBox.StandardButton.Abort) btnAbort = mb.addButton(QtGui.QMessageBox.StandardButton.Abort)
btnOK = mb.addButton(_translate("Part_JoinFeatures","Continue",None), QtGui.QMessageBox.ButtonRole.ActionRole) btnOK = mb.addButton(_translate("Part_JoinFeatures","Continue",None), QtGui.QMessageBox.ButtonRole.ActionRole)
@ -167,7 +167,7 @@ class ViewProviderConnect:
for obj in self.claimChildren(): for obj in self.claimChildren():
obj.ViewObject.show() obj.ViewObject.show()
except Exception as err: except Exception as err:
FreeCAD.Console.PrintError("Error in onDelete: " + err.message) FreeCAD.Console.PrintError("Error in onDelete: " + str(err))
return True return True
class CommandConnect: class CommandConnect:
@ -261,7 +261,7 @@ class ViewProviderEmbed:
self.Object.Base.ViewObject.show() self.Object.Base.ViewObject.show()
self.Object.Tool.ViewObject.show() self.Object.Tool.ViewObject.show()
except Exception as err: except Exception as err:
FreeCAD.Console.PrintError("Error in onDelete: " + err.message) FreeCAD.Console.PrintError("Error in onDelete: " + str(err))
return True return True
class CommandEmbed: class CommandEmbed:
@ -356,7 +356,7 @@ class ViewProviderCutout:
self.Object.Base.ViewObject.show() self.Object.Base.ViewObject.show()
self.Object.Tool.ViewObject.show() self.Object.Tool.ViewObject.show()
except Exception as err: except Exception as err:
FreeCAD.Console.PrintError("Error in onDelete: " + err.message) FreeCAD.Console.PrintError("Error in onDelete: " + str(err))
return True return True

12
src/Mod/Part/BOPTools/SplitFeatures.py
View File

@ -119,7 +119,7 @@ class ViewProviderBooleanFragments:
for obj in self.claimChildren(): for obj in self.claimChildren():
obj.ViewObject.show() obj.ViewObject.show()
except Exception as err: except Exception as err:
FreeCAD.Console.PrintError("Error in onDelete: " + err.message) FreeCAD.Console.PrintError("Error in onDelete: " + str(err))
return True return True
def cmdCreateBooleanFragmentsFeature(name, mode): def cmdCreateBooleanFragmentsFeature(name, mode):
@ -141,7 +141,7 @@ def cmdCreateBooleanFragmentsFeature(name, mode):
mb = QtGui.QMessageBox() mb = QtGui.QMessageBox()
mb.setIcon(mb.Icon.Warning) 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) 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)) mb.setWindowTitle(_translate("Part_SplitFeatures","Bad selection", None))
btnAbort = mb.addButton(QtGui.QMessageBox.StandardButton.Abort) btnAbort = mb.addButton(QtGui.QMessageBox.StandardButton.Abort)
btnOK = mb.addButton(_translate("Part_SplitFeatures","Continue",None), QtGui.QMessageBox.ButtonRole.ActionRole) btnOK = mb.addButton(_translate("Part_SplitFeatures","Continue",None), QtGui.QMessageBox.ButtonRole.ActionRole)
@ -246,7 +246,7 @@ class ViewProviderSlice:
for obj in self.claimChildren(): for obj in self.claimChildren():
obj.ViewObject.show() obj.ViewObject.show()
except Exception as err: except Exception as err:
FreeCAD.Console.PrintError("Error in onDelete: " + err.message) FreeCAD.Console.PrintError("Error in onDelete: " + str(err))
return True return True
def cmdCreateSliceFeature(name, mode): def cmdCreateSliceFeature(name, mode):
@ -269,7 +269,7 @@ def cmdCreateSliceFeature(name, mode):
mb = QtGui.QMessageBox() mb = QtGui.QMessageBox()
mb.setIcon(mb.Icon.Warning) 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) 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)) mb.setWindowTitle(_translate("Part_SplitFeatures","Bad selection", None))
btnAbort = mb.addButton(QtGui.QMessageBox.StandardButton.Abort) btnAbort = mb.addButton(QtGui.QMessageBox.StandardButton.Abort)
btnOK = mb.addButton(_translate("Part_SplitFeatures","Continue",None), QtGui.QMessageBox.ButtonRole.ActionRole) btnOK = mb.addButton(_translate("Part_SplitFeatures","Continue",None), QtGui.QMessageBox.ButtonRole.ActionRole)
@ -374,7 +374,7 @@ class ViewProviderXOR:
for obj in self.claimChildren(): for obj in self.claimChildren():
obj.ViewObject.show() obj.ViewObject.show()
except Exception as err: except Exception as err:
FreeCAD.Console.PrintError("Error in onDelete: " + err.message) FreeCAD.Console.PrintError("Error in onDelete: " + str(err))
return True return True
def cmdCreateXORFeature(name): def cmdCreateXORFeature(name):
@ -395,7 +395,7 @@ def cmdCreateXORFeature(name):
mb = QtGui.QMessageBox() mb = QtGui.QMessageBox()
mb.setIcon(mb.Icon.Warning) 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) 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)) mb.setWindowTitle(_translate("Part_SplitFeatures","Bad selection", None))
btnAbort = mb.addButton(QtGui.QMessageBox.StandardButton.Abort) btnAbort = mb.addButton(QtGui.QMessageBox.StandardButton.Abort)
btnOK = mb.addButton(_translate("Part_SplitFeatures","Continue",None), QtGui.QMessageBox.ButtonRole.ActionRole) btnOK = mb.addButton(_translate("Part_SplitFeatures","Continue",None), QtGui.QMessageBox.ButtonRole.ActionRole)

7
src/Mod/Part/InitGui.py
View File

@ -41,14 +41,15 @@ class PartWorkbench ( Workbench ):
def Initialize(self): def Initialize(self):
# load the module # load the module
import PartGui import PartGui
import Part import BOPTools
import CompoundTools._CommandCompoundFilter import CompoundTools._CommandCompoundFilter
try: try:
Part.BOPTools.addCommands() BOPTools.importAll()
BOPTools.addCommands()
except Exception as err: 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): def GetClassName(self):
return "PartGui::Workbench" return "PartGui::Workbench"

4
src/Mod/Part/JoinFeatures.py
View File

@ -158,7 +158,7 @@ class _ViewProviderPartJoinFeature:
self.Object.Base.ViewObject.show() self.Object.Base.ViewObject.show()
self.Object.Tool.ViewObject.show() self.Object.Tool.ViewObject.show()
except Exception as err: except Exception as err:
FreeCAD.Console.PrintError("Error in onDelete: " + err.message) FreeCAD.Console.PrintError("Error in onDelete: " + str(err))
return True return True
# #
@ -176,7 +176,7 @@ class _ViewProviderPartJoinFeature:
# mb = QtGui.QMessageBox() # mb = QtGui.QMessageBox()
# mb.setIcon(mb.Icon.Warning) # 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) # 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)) # mb.setWindowTitle(_translate("Part_JoinFeatures","Bad selection", None))
# btnAbort = mb.addButton(QtGui.QMessageBox.StandardButton.Abort) # btnAbort = mb.addButton(QtGui.QMessageBox.StandardButton.Abort)
# btnOK = mb.addButton(_translate("Part_JoinFeatures","Continue",None), QtGui.QMessageBox.ButtonRole.ActionRole) # btnOK = mb.addButton(_translate("Part_JoinFeatures","Continue",None), QtGui.QMessageBox.ButtonRole.ActionRole)