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

Merge pull request #23892 from alihantadal/feature_23649_update_confusing_nomenclature_offset_pattern

Browse Source 
CAM: Improve confusing nomenclature: Offset Pattern (#23649)
This commit is contained in:
sliptonic
2025-09-22 11:42:31 -05:00
committed by GitHub
parent 11762a32b1 434314f5a7
commit 4179075b72
5 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mod/CAM/Gui/Resources/panels/PageOpPocketFullEdit.ui
View File

@@ -114,14 +114,14 @@ The latter can be used to face of the entire stock area to ensure uniform height
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="offsetPattern_label">
<widget class="QLabel" name="clearingPattern_label">
<property name="text">
<string>Pattern</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="offsetPattern">
<widget class="QComboBox" name="clearingPattern">
<property name="toolTip">
<string>Pattern the tool bit is moved in to clear the material</string>
</property>

4
src/Mod/CAM/Path/Op/Area.py
View File

@@ -290,8 +290,8 @@ class ObjectOp(PathOp.ObjectOp):
# disable path sorting for offset and zigzag-offset paths
if (
hasattr(obj, "OffsetPattern")
and obj.OffsetPattern in ["ZigZagOffset", "Offset"]
hasattr(obj, "ClearingPattern")
and obj.ClearingPattern in ["ZigZagOffset", "Offset"]
and hasattr(obj, "MinTravel")
and not obj.MinTravel
):

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

@@ -51,7 +51,7 @@ class TaskPanelOpPage(PathPocketBaseGui.TaskPanelOpPage):
form = FreeCADGui.PySideUic.loadUi(":/panels/PageOpPocketFullEdit.ui")
comboToPropertyMap = [
("cutMode", "CutMode"),
("offsetPattern", "OffsetPattern"),
("clearingPattern", "ClearingPattern"),
("boundaryShape", "BoundaryShape"),
]

12
src/Mod/CAM/Path/Op/Gui/PocketBase.py
View File

@@ -68,7 +68,7 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage):
comboToPropertyMap = [
("cutMode", "CutMode"),
("offsetPattern", "OffsetPattern"),
("clearingPattern", "ClearingPattern"),
]
enumTups = PathPocket.ObjectPocket.pocketPropertyEnumerations(dataType="raw")
@@ -100,7 +100,7 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage):
obj.MinTravel = self.form.minTravel.isChecked()
def updateZigZagAngle(self, obj, setModel=True):
if obj.OffsetPattern in ["Offset"]:
if obj.ClearingPattern in ["Offset"]:
self.form.zigZagAngle.setEnabled(False)
else:
self.form.zigZagAngle.setEnabled(True)
@@ -114,8 +114,8 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage):
obj.CutMode = str(self.form.cutMode.currentData())
if obj.StepOver != self.form.stepOverPercent.value():
obj.StepOver = self.form.stepOverPercent.value()
if obj.OffsetPattern != str(self.form.offsetPattern.currentData()):
obj.OffsetPattern = str(self.form.offsetPattern.currentData())
if obj.ClearingPattern != str(self.form.clearingPattern.currentData()):
obj.ClearingPattern = str(self.form.clearingPattern.currentData())
PathGuiUtil.updateInputField(obj, "ExtraOffset", self.form.extraOffset)
self.updateToolController(obj, self.form.toolController)
@@ -162,7 +162,7 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage):
self.form.minTravel.setChecked(obj.MinTravel)
self.updateMinTravel(obj, False)
self.selectInComboBox(obj.OffsetPattern, self.form.offsetPattern)
self.selectInComboBox(obj.ClearingPattern, self.form.clearingPattern)
self.selectInComboBox(obj.CutMode, self.form.cutMode)
self.setupToolController(obj, self.form.toolController)
self.setupCoolant(obj, self.form.coolantController)
@@ -176,7 +176,7 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage):
signals = []
signals.append(self.form.cutMode.currentIndexChanged)
signals.append(self.form.offsetPattern.currentIndexChanged)
signals.append(self.form.clearingPattern.currentIndexChanged)
signals.append(self.form.stepOverPercent.editingFinished)
signals.append(self.form.zigZagAngle.editingFinished)
signals.append(self.form.toolController.currentIndexChanged)

13
src/Mod/CAM/Path/Op/PocketBase.py
View File

@@ -65,7 +65,7 @@ class ObjectPocket(PathAreaOp.ObjectOp):
(translate("CAM_Pocket", "Center"), "Center"),
(translate("CAM_Pocket", "Edge"), "Edge"),
],
"OffsetPattern": [
"ClearingPattern": [
(translate("CAM_Pocket", "ZigZag"), "ZigZag"),
(translate("CAM_Pocket", "Offset"), "Offset"),
(translate("CAM_Pocket", "ZigZagOffset"), "ZigZagOffset"),
@@ -159,8 +159,8 @@ class ObjectPocket(PathAreaOp.ObjectOp):
)
obj.addProperty(
"App::PropertyEnumeration",
"OffsetPattern",
"Face",
"ClearingPattern",
"Pocket",
QT_TRANSLATE_NOOP("App::Property", "Clearing pattern to use"),
)
obj.addProperty(
@@ -233,7 +233,7 @@ class ObjectPocket(PathAreaOp.ObjectOp):
"Grid": 6,
}
params["PocketMode"] = Pattern.get(obj.OffsetPattern, 1)
params["PocketMode"] = Pattern.get(obj.ClearingPattern, 1)
if obj.SplitArcs:
params["Explode"] = True
@@ -266,6 +266,9 @@ class ObjectPocket(PathAreaOp.ObjectOp):
),
)
if hasattr(obj, "OffsetPattern"):
obj.setGroupOfProperty("OffsetPattern", "Pocket")
obj.renameProperty("OffsetPattern", "ClearingPattern")
if hasattr(obj, "RestMachiningRegions"):
obj.removeProperty("RestMachiningRegions")
if hasattr(obj, "RestMachiningRegionsNeedRecompute"):
@@ -301,7 +304,7 @@ def SetupProperties():
setup.append("ExtraOffset")
setup.append("StepOver")
setup.append("ZigZagAngle")
setup.append("OffsetPattern")
setup.append("ClearingPattern")
setup.append("StartAt")
setup.append("MinTravel")
setup.append("KeepToolDown")