From fad9f7702645d75bb68d00fa56ee6a0e0d2645bf Mon Sep 17 00:00:00 2001 From: Markus Lampert Date: Sat, 29 Jun 2019 23:54:07 -0700 Subject: [PATCH] Cleanup of PathJobGui for pylint warnings --- src/Mod/Path/PathScripts/PathJobGui.py | 67 ++++++++++++++++++++------ 1 file changed, 53 insertions(+), 14 deletions(-) diff --git a/src/Mod/Path/PathScripts/PathJobGui.py b/src/Mod/Path/PathScripts/PathJobGui.py index 01fa39ef4b9e..3372a7df0a27 100644 --- a/src/Mod/Path/PathScripts/PathJobGui.py +++ b/src/Mod/Path/PathScripts/PathJobGui.py @@ -62,6 +62,7 @@ def translate(context, text, disambig=None): def _OpenCloseResourceEditor(obj, vobj, edit): + # pylint: disable=unused-argument job = PathUtils.findParentJob(obj) if job and job.ViewObject and job.ViewObject.Proxy: if edit: @@ -103,6 +104,20 @@ def __init__(self, vobj): vobj.setEditorMode('Transparency', mode) self.deleteOnReject = True + # initialized later + self.axs = None + self.mat = None + self.obj = None + self.sca = None + self.scs = None + self.sep = None + self.sph = None + self.switch = None + self.taskPanel = None + self.vobj = None + self.baseVisibility = None + self.stockVisibility = None + def attach(self, vobj): self.vobj = vobj self.obj = vobj.Object @@ -146,6 +161,7 @@ def deleteObjectsOnReject(self): return hasattr(self, 'deleteOnReject') and self.deleteOnReject def setEdit(self, vobj=None, mode=0): + # pylint: disable=unused-argument PathLog.track(mode) if 0 == mode: self.openTaskPanel() @@ -164,6 +180,7 @@ def resetTaskPanel(self): self.taskPanel = None def unsetEdit(self, arg1, arg2): + # pylint: disable=unused-argument if self.taskPanel: self.taskPanel.reject(False) @@ -177,6 +194,7 @@ def editObject(self, obj): return self.openTaskPanel() def uneditObject(self, obj=None): + # pylint: disable=unused-argument self.unsetEdit(None, None) def getIcon(self): @@ -220,6 +238,7 @@ def rememberBaseVisibility(self, obj, base): base.ViewObject.Visibility = True def forgetBaseVisibility(self, obj, base): + # pylint: disable=unused-argument if self.baseVisibility.get(base.Name): visibility = self.baseVisibility[base.Name] visibility[0].ViewObject.Visibility = visibility[1] @@ -243,6 +262,7 @@ def resetEditVisibility(self, obj): obj.Stock.ViewObject.Visibility = self.stockVisibility def setupContextMenu(self, vobj, menu): + # pylint: disable=unused-argument PathLog.track() for action in menu.actions(): menu.removeAction(action) @@ -311,11 +331,20 @@ class StockFromBaseBoundBoxEdit(StockEdit): Index = 2 StockType = PathStock.StockType.FromBase + def __init__(self, obj, form, force): + super(StockFromBaseBoundBoxEdit, self).__init__(obj, form, force) + + self.trackXpos = None + self.trackYpos = None + self.trackZpos = None + def editorFrame(self): PathLog.track() return self.form.stockFromBase - def getFieldsStock(self, stock, fields=['xneg', 'xpos', 'yneg', 'ypos', 'zneg', 'zpos']): + def getFieldsStock(self, stock, fields=None): + if fields is None: + fields = ['xneg', 'xpos', 'yneg', 'ypos', 'zneg', 'zpos'] try: if 'xneg' in fields: stock.ExtXneg = FreeCAD.Units.Quantity(self.form.stockExtXneg.text()) @@ -329,10 +358,12 @@ def getFieldsStock(self, stock, fields=['xneg', 'xpos', 'yneg', 'ypos', 'zneg', stock.ExtZneg = FreeCAD.Units.Quantity(self.form.stockExtZneg.text()) if 'zpos' in fields: stock.ExtZpos = FreeCAD.Units.Quantity(self.form.stockExtZpos.text()) - except Exception: + except Exception: # pylint: disable=broad-except pass - def getFields(self, obj, fields=['xneg', 'xpos', 'yneg', 'ypos', 'zneg', 'zpos']): + def getFields(self, obj, fields=None): + if fields is None: + fields = ['xneg', 'xpos', 'yneg', 'ypos', 'zneg', 'zpos'] PathLog.track(obj.Label, fields) if self.IsStock(obj): self.getFieldsStock(obj.Stock, fields) @@ -409,7 +440,9 @@ class StockCreateBoxEdit(StockEdit): def editorFrame(self): return self.form.stockCreateBox - def getFields(self, obj, fields=['length', 'widht', 'height']): + def getFields(self, obj, fields=None): + if fields is None: + fields = ['length', 'widht', 'height'] try: if self.IsStock(obj): if 'length' in fields: @@ -420,7 +453,7 @@ def getFields(self, obj, fields=['length', 'widht', 'height']): obj.Stock.Height = FreeCAD.Units.Quantity(self.form.stockBoxHeight.text()) else: PathLog.error(translate('PathJob', 'Stock not a box!')) - except Exception: + except Exception: # pylint: disable=broad-except pass def setFields(self, obj): @@ -445,7 +478,9 @@ class StockCreateCylinderEdit(StockEdit): def editorFrame(self): return self.form.stockCreateCylinder - def getFields(self, obj, fields=['radius', 'height']): + def getFields(self, obj, fields=None): + if fields is None: + fields = ['radius', 'height'] try: if self.IsStock(obj): if 'radius' in fields: @@ -454,7 +489,7 @@ def getFields(self, obj, fields=['radius', 'height']): obj.Stock.Height = FreeCAD.Units.Quantity(self.form.stockCylinderHeight.text()) else: PathLog.error(translate('PathJob', 'Stock not a cylinder!')) - except Exception: + except Exception: # pylint: disable=broad-except pass def setFields(self, obj): @@ -624,7 +659,7 @@ def getFields(self): if self.form.wcslist.item(i).checkState() == QtCore.Qt.CheckState.Checked: flist.append(self.form.wcslist.item(i).text()) self.obj.Fixtures = flist - except Exception: + except Exception: # pylint: disable=broad-except FreeCAD.Console.PrintWarning("The Job was created without fixture support. Please delete and recreate the job\r\n") self.updateTooltips() @@ -830,7 +865,7 @@ def toolControllerChanged(self, item): elif 'Number' == prop: try: tc.ToolNumber = int(item.text()) - except Exception: + except Exception: # pylint: disable=broad-except pass item.setText("%d" % tc.ToolNumber) elif 'Spindle' == prop: @@ -842,7 +877,7 @@ def toolControllerChanged(self, item): speed = -speed tc.SpindleDir = rot tc.SpindleSpeed = speed - except Exception: + except Exception: # pylint: disable=broad-except pass item.setText("%s%g" % ('+' if tc.SpindleDir == 'Forward' else '-', tc.SpindleSpeed)) elif 'HorizFeed' == prop or 'VertFeed' == prop: @@ -854,14 +889,14 @@ def toolControllerChanged(self, item): elif FreeCAD.Units.Unit() == val.Unit: val = FreeCAD.Units.Quantity(item.text() + vUnit) setattr(tc, prop, val) - except Exception: + except Exception: # pylint: disable=broad-except pass item.setText("%g" % getattr(tc, prop).getValueAs(vUnit)) else: try: val = FreeCAD.Units.Quantity(item.text()) setattr(tc, prop, val) - except Exception: + except Exception: # pylint: disable=broad-except pass item.setText("%g" % getattr(tc, prop).Value) @@ -1126,7 +1161,7 @@ def jobModelEdit(self): # first remove all obsolete base models for model, count in PathUtil.keyValueIter(obsolete): - for i in range(count): + for i in range(count): # pylint: disable=unused-variable # it seems natural to remove the last of all the base objects for a given model base = [b for b in obj.Model.Group if proxy.baseObject(obj, b) == model][-1] self.vproxy.forgetBaseVisibility(obj, base) @@ -1248,15 +1283,19 @@ def open(self): # SelectionObserver interface def addSelection(self, doc, obj, sub, pnt): + # pylint: disable=unused-argument self.updateSelection() def removeSelection(self, doc, obj, sub): + # pylint: disable=unused-argument self.updateSelection() def setSelection(self, doc): + # pylint: disable=unused-argument self.updateSelection() def clearSelection(self, doc): + # pylint: disable=unused-argument self.updateSelection() @@ -1272,7 +1311,7 @@ def Create(base, template=None): obj.Document.recompute() obj.ViewObject.Proxy.editObject(obj.Stock) return obj - except Exception as exc: + except Exception as exc: # pylint: disable=broad-except PathLog.error(exc) traceback.print_exc(exc) FreeCAD.ActiveDocument.abortTransaction()