diff --git a/src/Mod/Path/PathScripts/PathDrilling.py b/src/Mod/Path/PathScripts/PathDrilling.py index b7a57ed9ea..77a0fc4dbf 100644 --- a/src/Mod/Path/PathScripts/PathDrilling.py +++ b/src/Mod/Path/PathScripts/PathDrilling.py @@ -73,7 +73,7 @@ class ObjectDrilling(PathCircularHoleBase.ObjectOp): tiplength = 0.0 if obj.AddTipLength: - tiplength = PathUtils.drillTipLength(tool) + tiplength = PathUtils.drillTipLength(self.tool) holes = PathUtils.sort_jobs(holes, ['x', 'y']) self.commandlist.append(Path.Command('G90')) diff --git a/src/Mod/Path/PathScripts/PathOp.py b/src/Mod/Path/PathScripts/PathOp.py index 3815e261a1..1bf9151259 100644 --- a/src/Mod/Path/PathScripts/PathOp.py +++ b/src/Mod/Path/PathScripts/PathOp.py @@ -34,8 +34,11 @@ __title__ = "Base class for all operations." __author__ = "sliptonic (Brad Collette)" __url__ = "http://www.freecadweb.org" -PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) -PathLog.trackModule() +if False: + PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) + PathLog.trackModule() +else: + PathLog.setLevel(PathLog.Level.NOTICE, PathLog.thisModule()) # Qt tanslation handling def translate(context, text, disambig=None): @@ -168,6 +171,7 @@ class ObjectOp(object): return else: self.radius = tool.Diameter/2 + self.tool = tool self.commandlist = [] self.commandlist.append(Path.Command("(%s)" % obj.Label)) diff --git a/src/Mod/Path/PathScripts/PathOpGui.py b/src/Mod/Path/PathScripts/PathOpGui.py index ac3da86390..ed68bfc1a3 100644 --- a/src/Mod/Path/PathScripts/PathOpGui.py +++ b/src/Mod/Path/PathScripts/PathOpGui.py @@ -142,7 +142,6 @@ class TaskPanelPage(object): self.setFields(self.obj) def pageRegisterSignalHandlers(self): - PathLog.info("pageRegisterSignalHandlers(%s)" % self.getTitle(self.obj)) for signal in self.getSignalsForUpdate(self.obj): signal.connect(self.pageGetFields) self.registerSignalHandlers(self.obj) @@ -328,14 +327,12 @@ class TaskPanelHeightsPage(TaskPanelPage): self.form.safeHeight.setText(FreeCAD.Units.Quantity(obj.SafeHeight.Value, FreeCAD.Units.Length).UserString) self.form.clearanceHeight.setText(FreeCAD.Units.Quantity(obj.ClearanceHeight.Value, FreeCAD.Units.Length).UserString) def getSignalsForUpdate(self, obj): - PathLog.info("getSignalsForUpdate(%s)" % obj.Label) signals = [] signals.append(self.form.safeHeight.editingFinished) signals.append(self.form.clearanceHeight.editingFinished) return signals def pageUpdateData(self, obj, prop): - PathLog.info("pageUpdateData(%s)" % prop) if prop in ['SafeHeight', 'ClearanceHeight']: self.setFields(obj)