diff --git a/src/Mod/CAM/Path/Base/Gui/Util.py b/src/Mod/CAM/Path/Base/Gui/Util.py index 4cf15a4ad8..1606d0af6b 100644 --- a/src/Mod/CAM/Path/Base/Gui/Util.py +++ b/src/Mod/CAM/Path/Base/Gui/Util.py @@ -134,7 +134,7 @@ class QuantitySpinBox(QtCore.QObject): def eventFilter(self, obj, event): if event.type() == QtCore.QEvent.Type.FocusIn: - self.updateSpinBox() + self.updateWidget() return False def onWidgetValueChanged(self): diff --git a/src/Mod/CAM/Path/Dressup/Gui/AxisMap.py b/src/Mod/CAM/Path/Dressup/Gui/AxisMap.py index e78d61784f..7757d4f0e4 100644 --- a/src/Mod/CAM/Path/Dressup/Gui/AxisMap.py +++ b/src/Mod/CAM/Path/Dressup/Gui/AxisMap.py @@ -179,7 +179,7 @@ class TaskPanel: self.obj.Proxy.execute(self.obj) def updateUI(self): - self.radius.updateSpinBox() + self.radius.updateWidget() self.form.axisMapInput.setCurrentText(self.obj.AxisMap) self.updateModel() diff --git a/src/Mod/CAM/Path/Dressup/Gui/Dragknife.py b/src/Mod/CAM/Path/Dressup/Gui/Dragknife.py index 30cdc09854..69df6b2b85 100644 --- a/src/Mod/CAM/Path/Dressup/Gui/Dragknife.py +++ b/src/Mod/CAM/Path/Dressup/Gui/Dragknife.py @@ -508,9 +508,9 @@ class TaskPanel: self.obj.Proxy.execute(self.obj) def updateUI(self): - self.filterAngle.updateSpinBox() - self.offsetDistance.updateSpinBox() - self.pivotHeight.updateSpinBox() + self.filterAngle.updateWidget() + self.offsetDistance.updateWidget() + self.pivotHeight.updateWidget() def updateModel(self): self.getFields() diff --git a/src/Mod/CAM/Path/Op/Gui/Base.py b/src/Mod/CAM/Path/Op/Gui/Base.py index ce2586cc0f..470bf3b521 100644 --- a/src/Mod/CAM/Path/Op/Gui/Base.py +++ b/src/Mod/CAM/Path/Op/Gui/Base.py @@ -811,8 +811,8 @@ class TaskPanelHeightsPage(TaskPanelPage): self.clearanceHeight.updateProperty() def setFields(self, obj): - self.safeHeight.updateSpinBox() - self.clearanceHeight.updateSpinBox() + self.safeHeight.updateWidget() + self.clearanceHeight.updateWidget() def getSignalsForUpdate(self, obj): signals = [] @@ -911,13 +911,13 @@ class TaskPanelDepthsPage(TaskPanelPage): def setFields(self, obj): if self.haveStartDepth(): - self.startDepth.updateSpinBox() + self.startDepth.updateWidget() if self.haveFinalDepth(): - self.finalDepth.updateSpinBox() + self.finalDepth.updateWidget() if self.haveStepDown(): - self.stepDown.updateSpinBox() + self.stepDown.updateWidget() if self.haveFinishDepth(): - self.finishDepth.updateSpinBox() + self.finishDepth.updateWidget() self.updateSelection(obj, FreeCADGui.Selection.getSelectionEx()) def getSignalsForUpdate(self, obj): @@ -953,7 +953,7 @@ class TaskPanelDepthsPage(TaskPanelPage): if spinbox.expression(): obj.setExpression(prop, None) self.setDirty() - spinbox.updateSpinBox(FreeCAD.Units.Quantity(z, FreeCAD.Units.Length)) + spinbox.updateWidget(FreeCAD.Units.Quantity(z, FreeCAD.Units.Length)) if spinbox.updateProperty(): self.setDirty() else: @@ -1005,8 +1005,8 @@ class TaskPanelDiametersPage(TaskPanelPage): self.maxDiameter.updateProperty() def setFields(self, obj): - self.minDiameter.updateSpinBox() - self.maxDiameter.updateSpinBox() + self.minDiameter.updateWidget() + self.maxDiameter.updateWidget() def getSignalsForUpdate(self, obj): signals = [] diff --git a/src/Mod/CAM/Path/Op/Gui/Drilling.py b/src/Mod/CAM/Path/Op/Gui/Drilling.py index 55940ef298..f39afee560 100644 --- a/src/Mod/CAM/Path/Op/Gui/Drilling.py +++ b/src/Mod/CAM/Path/Op/Gui/Drilling.py @@ -107,9 +107,9 @@ class TaskPanelOpPage(PathCircularHoleBaseGui.TaskPanelOpPage): return form def updateQuantitySpinBoxes(self, index=None): - self.peckDepthSpinBox.updateSpinBox() - self.peckRetractSpinBox.updateSpinBox() - self.dwellTimeSpinBox.updateSpinBox() + self.peckDepthSpinBox.updateWidget() + self.peckRetractSpinBox.updateWidget() + self.dwellTimeSpinBox.updateWidget() def getFields(self, obj): """setFields(obj) ... update obj's properties with values from the UI""" diff --git a/src/Mod/CAM/Path/Op/Gui/FeatureExtension.py b/src/Mod/CAM/Path/Op/Gui/FeatureExtension.py index 12132e2876..9de4307630 100644 --- a/src/Mod/CAM/Path/Op/Gui/FeatureExtension.py +++ b/src/Mod/CAM/Path/Op/Gui/FeatureExtension.py @@ -282,7 +282,7 @@ class TaskPanelExtensionPage(PathOpGui.TaskPanelPage): self._autoEnableExtensions() # Check edge count for auto-disable Extensions on initial Task Panel loading self._initializeExtensions(obj) # Efficiently initialize Extensions - self.defaultLength.updateSpinBox() + self.defaultLength.updateWidget() self._getUseOutlineState() # Find `useOutline` checkbox and get its boolean value self.lastDefaultLength = self.form.defaultLength.text() # set last DL value self.fieldsSet = True # flag to identify initial values set @@ -304,7 +304,7 @@ class TaskPanelExtensionPage(PathOpGui.TaskPanelPage): """_applyDefaultLengthChange(index=None)... Helper method to update Default Length spinbox, and update extensions due to change in Default Length.""" - self.defaultLength.updateSpinBox() + self.defaultLength.updateWidget() if self.form.defaultLength.text() != self.lastDefaultLength: self.lastDefaultLength = self.form.defaultLength.text() self._resetCachedExtensions() # Reset extension cache because extension dimensions likely changed diff --git a/src/Mod/CAM/Path/Op/Gui/Slot.py b/src/Mod/CAM/Path/Op/Gui/Slot.py index 5118097400..0b6ad86cd7 100644 --- a/src/Mod/CAM/Path/Op/Gui/Slot.py +++ b/src/Mod/CAM/Path/Op/Gui/Slot.py @@ -107,8 +107,8 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage): self.form.reverseDirection.setCheckState(QtCore.Qt.Unchecked) def updateQuantitySpinBoxes(self): - self.geo1Extension.updateSpinBox() - self.geo2Extension.updateSpinBox() + self.geo1Extension.updateWidget() + self.geo2Extension.updateWidget() def getFields(self, obj): """getFields(obj) ... transfers values from UI to obj's properties""" diff --git a/src/Mod/CAM/Path/Op/Gui/Tapping.py b/src/Mod/CAM/Path/Op/Gui/Tapping.py index c0f51bc0fb..d42f7bbc1d 100644 --- a/src/Mod/CAM/Path/Op/Gui/Tapping.py +++ b/src/Mod/CAM/Path/Op/Gui/Tapping.py @@ -100,9 +100,9 @@ class TaskPanelOpPage(PathCircularHoleBaseGui.TaskPanelOpPage): return form def updateQuantitySpinBoxes(self, index=None): - # self.peckDepthSpinBox.updateSpinBox() - # self.peckRetractSpinBox.updateSpinBox() - self.dwellTimeSpinBox.updateSpinBox() + # self.peckDepthSpinBox.updateWidget() + # self.peckRetractSpinBox.updateWidget() + self.dwellTimeSpinBox.updateWidget() def getFields(self, obj): """setFields(obj) ... update obj's properties with values from the UI""" diff --git a/src/Mod/CAM/Path/Op/Gui/ThreadMilling.py b/src/Mod/CAM/Path/Op/Gui/ThreadMilling.py index 5f019d90e4..4b6d95c78b 100644 --- a/src/Mod/CAM/Path/Op/Gui/ThreadMilling.py +++ b/src/Mod/CAM/Path/Op/Gui/ThreadMilling.py @@ -135,9 +135,9 @@ class TaskPanelOpPage(PathCircularHoleBaseGui.TaskPanelOpPage): QtCore.Qt.Checked if obj.LeadInOut else QtCore.Qt.Unchecked ) - self.majorDia.updateSpinBox() - self.minorDia.updateSpinBox() - self.pitch.updateSpinBox() + self.majorDia.updateWidget() + self.minorDia.updateWidget() + self.pitch.updateWidget() self.setupToolController(obj, self.form.toolController) self._updateFromThreadType() @@ -184,7 +184,7 @@ class TaskPanelOpPage(PathCircularHoleBaseGui.TaskPanelOpPage): self.form.threadPitchLabel.setEnabled(False) self.form.threadTPI.setEnabled(True) self.form.threadTPILabel.setEnabled(True) - self.pitch.updateSpinBox(0) + self.pitch.updateWidget(0) fillThreads( self.form, PathThreadMilling.ThreadTypeData[self.form.threadType.currentData()], @@ -205,7 +205,7 @@ class TaskPanelOpPage(PathCircularHoleBaseGui.TaskPanelOpPage): if self._isThreadMetric(): pitch = float(thread["pitch"]) - self.pitch.updateSpinBox(pitch) + self.pitch.updateWidget(pitch) if self._isThreadImperial(): tpi = int(thread["tpi"]) @@ -213,8 +213,8 @@ class TaskPanelOpPage(PathCircularHoleBaseGui.TaskPanelOpPage): minor = minor * 25.4 major = major * 25.4 - self.majorDia.updateSpinBox(major) - self.minorDia.updateSpinBox(minor) + self.majorDia.updateWidget(major) + self.minorDia.updateWidget(minor) self.setDirty() diff --git a/src/Mod/CAM/Path/Op/Gui/Vcarve.py b/src/Mod/CAM/Path/Op/Gui/Vcarve.py index 8d8a2c93f5..741b2214b9 100644 --- a/src/Mod/CAM/Path/Op/Gui/Vcarve.py +++ b/src/Mod/CAM/Path/Op/Gui/Vcarve.py @@ -187,7 +187,7 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage): self.form.finishingPassEnabled.setChecked(obj.FinishingPass) self.form.optimizeMovementsEnabled.setChecked(obj.OptimizeMovements) - self.finishingPassZOffsetSpinBox.updateSpinBox() + self.finishingPassZOffsetSpinBox.updateWidget() self.setupToolController(obj, self.form.toolController) self.setupCoolant(obj, self.form.coolantController) diff --git a/src/Mod/CAM/Path/Tool/Gui/Controller.py b/src/Mod/CAM/Path/Tool/Gui/Controller.py index 9e07e953b9..0a5374b5af 100644 --- a/src/Mod/CAM/Path/Tool/Gui/Controller.py +++ b/src/Mod/CAM/Path/Tool/Gui/Controller.py @@ -232,10 +232,10 @@ class ToolControllerEditor(object): tc = self.obj self.form.tcName.setText(tc.Label) self.form.tcNumber.setValue(tc.ToolNumber) - self.horizFeed.updateSpinBox() - self.horizRapid.updateSpinBox() - self.vertFeed.updateSpinBox() - self.vertRapid.updateSpinBox() + self.horizFeed.updateWidget() + self.horizRapid.updateWidget() + self.vertFeed.updateWidget() + self.vertRapid.updateWidget() self.form.spindleSpeed.setValue(tc.SpindleSpeed) self.selectInComboBox(tc.SpindleDir, self.form.spindleDirection)