kindred/create
1
1
Fork 0
Code Issues 47 Pull Requests Actions 4 Packages Projects 9 Releases 2 Wiki Activity

CAM: Fix: updateSpinBox renamed to updateWidget

Browse Source
This commit is contained in:
Samuel Abels
2025-05-20 17:08:21 +02:00
parent d5bc1642dc
commit 0fb67224d3
11 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/CAM/Path/Base/Gui/Util.py
View File

@@ -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):

2
src/Mod/CAM/Path/Dressup/Gui/AxisMap.py
View File

@@ -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()

6
src/Mod/CAM/Path/Dressup/Gui/Dragknife.py
View File

@@ -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()

18
src/Mod/CAM/Path/Op/Gui/Base.py
View File

@@ -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 = []

6
src/Mod/CAM/Path/Op/Gui/Drilling.py
View File

@@ -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"""

4
src/Mod/CAM/Path/Op/Gui/FeatureExtension.py
View File

@@ -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

4
src/Mod/CAM/Path/Op/Gui/Slot.py
View File

@@ -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"""

6
src/Mod/CAM/Path/Op/Gui/Tapping.py
View File

@@ -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"""

14
src/Mod/CAM/Path/Op/Gui/ThreadMilling.py
View File

@@ -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()

2
src/Mod/CAM/Path/Op/Gui/Vcarve.py
View File

@@ -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)

8
src/Mod/CAM/Path/Tool/Gui/Controller.py
View File

@@ -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)