diff --git a/src/Mod/Path/Path/Op/Gui/Drilling.py b/src/Mod/Path/Path/Op/Gui/Drilling.py index 5502c17159..9f82b3401e 100644 --- a/src/Mod/Path/Path/Op/Gui/Drilling.py +++ b/src/Mod/Path/Path/Op/Gui/Drilling.py @@ -130,14 +130,14 @@ class TaskPanelOpPage(PathCircularHoleBaseGui.TaskPanelOpPage): self.updateQuantitySpinBoxes() if not hasattr(obj,"KeepToolDown"): - obj.addProperty("App::PropertyBool", "KeepToolDown", "Drill", + obj.addProperty("App::PropertyBool", "KeepToolDown", "Drill", QtCore.QT_TRANSLATE_NOOP("App::Property", "Apply G99 retraction: only retract to RetractHeight between holes in this operation")) if obj.KeepToolDown: self.form.KeepToolDownEnabled.setCheckState(QtCore.Qt.Checked) else: self.form.KeepToolDownEnabled.setCheckState(QtCore.Qt.Unchecked) - + if obj.DwellEnabled: self.form.dwellEnabled.setCheckState(QtCore.Qt.Checked) else: @@ -173,7 +173,7 @@ class TaskPanelOpPage(PathCircularHoleBaseGui.TaskPanelOpPage): signals.append(self.form.coolantController.currentIndexChanged) signals.append(self.form.ExtraOffset.currentIndexChanged) signals.append(self.form.KeepToolDownEnabled.stateChanged) - + return signals def updateData(self, obj, prop): diff --git a/src/Mod/Path/Path/Post/scripts/grbl_post.py b/src/Mod/Path/Path/Post/scripts/grbl_post.py index 5e1f8a656f..90e9087971 100755 --- a/src/Mod/Path/Path/Post/scripts/grbl_post.py +++ b/src/Mod/Path/Path/Post/scripts/grbl_post.py @@ -602,7 +602,7 @@ def drill_translate(outstring, cmd, params): global UNITS global UNIT_FORMAT global UNIT_SPEED_FORMAT - + strFormat = "." + str(PRECISION) + "f" strG0_Initial_Z=("G0 Z" + format(float(CURRENT_Z.getValueAs(UNIT_FORMAT)), strFormat) + "\n") @@ -728,10 +728,10 @@ def drill_translate(outstring, cmd, params): + format(float(drill_Z.getValueAs(UNIT_FORMAT)), strFormat) + strF_Feedrate ) - - if DRILL_RETRACT_MODE == "G98" : + + if DRILL_RETRACT_MODE == "G98" : trBuff += (linenumber() + strG0_Initial_Z) - else: + else: trBuff += (linenumber() + strG0_RETRACT_Z) break diff --git a/src/Tools/ThumbnailProvider/ClassFactory.cpp b/src/Tools/ThumbnailProvider/ClassFactory.cpp index 54108c983c..99c75f6420 100644 --- a/src/Tools/ThumbnailProvider/ClassFactory.cpp +++ b/src/Tools/ThumbnailProvider/ClassFactory.cpp @@ -44,7 +44,7 @@ CClassFactory::~CClassFactory() STDMETHODIMP CClassFactory::QueryInterface(REFIID riid, void** ppvObject) { - static const QITAB qit[] = + static const QITAB qit[] = { QITABENT(CClassFactory, IClassFactory), {0},