diff --git a/src/Mod/Path/PathScripts/PathAdaptiveGui.py b/src/Mod/Path/PathScripts/PathAdaptiveGui.py index 113fc1d91d..6be8647dfc 100644 --- a/src/Mod/Path/PathScripts/PathAdaptiveGui.py +++ b/src/Mod/Path/PathScripts/PathAdaptiveGui.py @@ -40,21 +40,6 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage): self.populateCombobox(form, enumTups, comboToPropertyMap) return form - def populateCombobox(self, form, enumTups, comboBoxesPropertyMap): - """fillComboboxes(form, comboBoxesPropertyMap) ... populate comboboxes with translated enumerations - ** comboBoxesPropertyMap will be unnecessary if UI files use strict combobox naming protocol. - Args: - form = UI form - enumTups = list of (translated_text, data_string) tuples - comboBoxesPropertyMap = list of (translated_text, data_string) tuples - """ - # Load appropriate enumerations in each combobox - for cb, prop in comboBoxesPropertyMap: - box = getattr(form, cb) # Get the combobox - box.clear() # clear the combobox - for text, data in enumTups[prop]: # load enumerations - box.addItem(text, data) - def getSignalsForUpdate(self, obj): """getSignalsForUpdate(obj) ... return list of signals for updating obj""" signals = [] diff --git a/src/Mod/Path/PathScripts/PathDrillingGui.py b/src/Mod/Path/PathScripts/PathDrillingGui.py index 8e1b34ae46..1ed09912ec 100644 --- a/src/Mod/Path/PathScripts/PathDrillingGui.py +++ b/src/Mod/Path/PathScripts/PathDrillingGui.py @@ -89,21 +89,6 @@ class TaskPanelOpPage(PathCircularHoleBaseGui.TaskPanelOpPage): return form - def populateCombobox(self, form, enumTups, comboBoxesPropertyMap): - """fillComboboxes(form, comboBoxesPropertyMap) ... populate comboboxes with translated enumerations - ** comboBoxesPropertyMap will be unnecessary if UI files use strict combobox naming protocol. - Args: - form = UI form - enumTups = list of (translated_text, data_string) tuples - comboBoxesPropertyMap = list of (translated_text, data_string) tuples - """ - # Load appropriate enumerations in each combobox - for cb, prop in comboBoxesPropertyMap: - box = getattr(form, cb) # Get the combobox - box.clear() # clear the combobox - for text, data in enumTups[prop]: # load enumerations - box.addItem(text, data) - def updateQuantitySpinBoxes(self, index=None): # pylint: disable=unused-argument self.peckDepthSpinBox.updateSpinBox() diff --git a/src/Mod/Path/PathScripts/PathHelixGui.py b/src/Mod/Path/PathScripts/PathHelixGui.py index f96b839b2a..4ea069ed1e 100644 --- a/src/Mod/Path/PathScripts/PathHelixGui.py +++ b/src/Mod/Path/PathScripts/PathHelixGui.py @@ -59,21 +59,6 @@ class TaskPanelOpPage(PathCircularHoleBaseGui.TaskPanelOpPage): self.populateCombobox(form, enumTups, comboToPropertyMap) return form - def populateCombobox(self, form, enumTups, comboBoxesPropertyMap): - """fillComboboxes(form, comboBoxesPropertyMap) ... populate comboboxes with translated enumerations - ** comboBoxesPropertyMap will be unnecessary if UI files use strict combobox naming protocol. - Args: - form = UI form - enumTups = list of (translated_text, data_string) tuples - comboBoxesPropertyMap = list of (translated_text, data_string) tuples - """ - # Load appropriate enumerations in each combobox - for cb, prop in comboBoxesPropertyMap: - box = getattr(form, cb) # Get the combobox - box.clear() # clear the combobox - for text, data in enumTups[prop]: # load enumerations - box.addItem(text, data) - def getFields(self, obj): """getFields(obj) ... transfers values from UI to obj's proprties""" PathLog.track() @@ -99,7 +84,11 @@ class TaskPanelOpPage(PathCircularHoleBaseGui.TaskPanelOpPage): self.setupToolController(obj, self.form.toolController) self.setupCoolant(obj, self.form.coolantController) - self.form.extraOffset.setText(FreeCAD.Units.Quantity(obj.OffsetExtra.Value, FreeCAD.Units.Length).UserString) + self.form.extraOffset.setText( + FreeCAD.Units.Quantity( + obj.OffsetExtra.Value, FreeCAD.Units.Length + ).UserString + ) def getSignalsForUpdate(self, obj): """getSignalsForUpdate(obj) ... return list of signals for updating obj""" diff --git a/src/Mod/Path/PathScripts/PathMillFaceGui.py b/src/Mod/Path/PathScripts/PathMillFaceGui.py index 5345629156..7ed8c37593 100644 --- a/src/Mod/Path/PathScripts/PathMillFaceGui.py +++ b/src/Mod/Path/PathScripts/PathMillFaceGui.py @@ -63,21 +63,6 @@ class TaskPanelOpPage(PathPocketBaseGui.TaskPanelOpPage): self.populateCombobox(form, enumTups, comboToPropertyMap) return form - def populateCombobox(self, form, enumTups, comboBoxesPropertyMap): - """fillComboboxes(form, comboBoxesPropertyMap) ... populate comboboxes with translated enumerations - ** comboBoxesPropertyMap will be unnecessary if UI files use strict combobox naming protocol. - Args: - form = UI form - enumTups = list of (translated_text, data_string) tuples - comboBoxesPropertyMap = list of (translated_text, data_string) tuples - """ - # Load appropriate enumerations in each combobox - for cb, prop in comboBoxesPropertyMap: - box = getattr(form, cb) # Get the combobox - box.clear() # clear the combobox - for text, data in enumTups[prop]: # load enumerations - box.addItem(text, data) - def pocketFeatures(self): """pocketFeatures() ... return FeatureFacing (see PathPocketBaseGui)""" return PathPocketBaseGui.FeatureFacing diff --git a/src/Mod/Path/PathScripts/PathOp.py b/src/Mod/Path/PathScripts/PathOp.py index c7a73c892c..9bcb53b249 100644 --- a/src/Mod/Path/PathScripts/PathOp.py +++ b/src/Mod/Path/PathScripts/PathOp.py @@ -326,6 +326,7 @@ class ObjectOp(object): ) for n in self.opPropertyEnumerations(): + PathLog.debug("n: {}".format(n)) PathLog.debug("n[0]: {} n[1]: {}".format(n[0], n[1])) if hasattr(obj, n[0]): setattr(obj, n[0], n[1]) @@ -356,7 +357,7 @@ class ObjectOp(object): @classmethod def opPropertyEnumerations(self, dataType="data"): - """propertyEnumerations(dataType="data")... return property enumeration lists of specified dataType. + """opPropertyEnumerations(dataType="data")... return property enumeration lists of specified dataType. Args: dataType = 'data', 'raw', 'translated' Notes: @@ -623,6 +624,7 @@ class ObjectOp(object): def _setBaseAndStock(self, obj, ignoreErrors=False): job = PathUtils.findParentJob(obj) + if not job: if not ignoreErrors: PathLog.error(translate("Path", "No parent job found for operation.")) diff --git a/src/Mod/Path/PathScripts/PathOpGui.py b/src/Mod/Path/PathScripts/PathOpGui.py index 79eeec2e10..76fa36a783 100644 --- a/src/Mod/Path/PathScripts/PathOpGui.py +++ b/src/Mod/Path/PathScripts/PathOpGui.py @@ -381,19 +381,8 @@ class TaskPanelPage(object): return def populateCombobox(self, form, enumTups, comboBoxesPropertyMap): - """fillComboboxes(form, comboBoxesPropertyMap) ... populate comboboxes with translated enumerations - ** comboBoxesPropertyMap will be unnecessary if UI files use strict combobox naming protocol. - Args: - form = UI form - enumTups = list of (translated_text, data_string) tuples - comboBoxesPropertyMap = list of (translated_text, data_string) tuples - """ - # Load appropriate enumerations in each combobox - for cb, prop in comboBoxesPropertyMap: - box = getattr(form, cb) # Get the combobox - box.clear() # clear the combobox - for text, data in enumTups[prop]: # load enumerations - box.addItem(text, data) + """populateCombobox(form, enumTups, comboBoxesPropertyMap) ... proxy for PathGui.populateCombobox()""" + PathGui.populateCombobox(form, enumTups, comboBoxesPropertyMap) def resetToolController(self, job, tc): if self.obj is not None: diff --git a/src/Mod/Path/PathScripts/PathPocketBaseGui.py b/src/Mod/Path/PathScripts/PathPocketBaseGui.py index 781800bdb2..75d6387933 100644 --- a/src/Mod/Path/PathScripts/PathPocketBaseGui.py +++ b/src/Mod/Path/PathScripts/PathPocketBaseGui.py @@ -95,21 +95,6 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage): return form - def populateCombobox(self, form, enumTups, comboBoxesPropertyMap): - """fillComboboxes(form, comboBoxesPropertyMap) ... populate comboboxes with translated enumerations - ** comboBoxesPropertyMap will be unnecessary if UI files use strict combobox naming protocol. - Args: - form = UI form - enumTups = list of (translated_text, data_string) tuples - comboBoxesPropertyMap = list of (translated_text, data_string) tuples - """ - # Load appropriate enumerations in each combobox - for cb, prop in comboBoxesPropertyMap: - box = getattr(form, cb) # Get the combobox - box.clear() # clear the combobox - for text, data in enumTups[prop]: # load enumerations - box.addItem(text, data) - def updateMinTravel(self, obj, setModel=True): if obj.UseStartPoint: self.form.minTravel.setEnabled(True) diff --git a/src/Mod/Path/PathScripts/PathThreadMillingGui.py b/src/Mod/Path/PathScripts/PathThreadMillingGui.py index 1514f951e1..23ae4b449b 100644 --- a/src/Mod/Path/PathScripts/PathThreadMillingGui.py +++ b/src/Mod/Path/PathScripts/PathThreadMillingGui.py @@ -95,21 +95,6 @@ class TaskPanelOpPage(PathCircularHoleBaseGui.TaskPanelOpPage): return form - def populateCombobox(self, form, enumTups, comboBoxesPropertyMap): - """fillComboboxes(form, comboBoxesPropertyMap) ... populate comboboxes with translated enumerations - ** comboBoxesPropertyMap will be unnecessary if UI files use strict combobox naming protocol. - Args: - form = UI form - enumTups = list of (translated_text, data_string) tuples - comboBoxesPropertyMap = list of (translated_text, data_string) tuples - """ - # Load appropriate enumerations in each combobox - for cb, prop in comboBoxesPropertyMap: - box = getattr(form, cb) # Get the combobox - box.clear() # clear the combobox - for text, data in enumTups[prop]: # load enumerations - box.addItem(text, data) - def getFields(self, obj): """getFields(obj) ... update obj's properties with values from the UI""" PathLog.track() diff --git a/src/Mod/Path/PathScripts/PathToolControllerGui.py b/src/Mod/Path/PathScripts/PathToolControllerGui.py index d92d39e025..a2e23aa651 100644 --- a/src/Mod/Path/PathScripts/PathToolControllerGui.py +++ b/src/Mod/Path/PathScripts/PathToolControllerGui.py @@ -197,7 +197,7 @@ class ToolControllerEditor(object): dataType="raw" ) - self.populateCombobox(self.form, enumTups, comboToPropertyMap) + PathGui.populateCombobox(self.form, enumTups, comboToPropertyMap) self.vertFeed = PathGui.QuantitySpinBox(self.form.vertFeed, obj, "VertFeed") self.horizFeed = PathGui.QuantitySpinBox(self.form.horizFeed, obj, "HorizFeed") self.vertRapid = PathGui.QuantitySpinBox(self.form.vertRapid, obj, "VertRapid") @@ -234,21 +234,6 @@ class ToolControllerEditor(object): combo.setCurrentIndex(index) return - def populateCombobox(self, form, enumTups, comboBoxesPropertyMap): - """fillComboboxes(form, comboBoxesPropertyMap) ... populate comboboxes with translated enumerations - ** comboBoxesPropertyMap will be unnecessary if UI files use strict combobox naming protocol. - Args: - form = UI form - enumTups = list of (translated_text, data_string) tuples - comboBoxesPropertyMap = list of (translated_text, data_string) tuples - """ - # Load appropriate enumerations in each combobox - for cb, prop in comboBoxesPropertyMap: - box = getattr(form, cb) # Get the combobox - box.clear() # clear the combobox - for text, data in enumTups[prop]: # load enumerations - box.addItem(text, data) - def updateUi(self): tc = self.obj self.form.tcName.setText(tc.Label)