From d495ee202dbf1744fa538eb02e09989f92d257d3 Mon Sep 17 00:00:00 2001
From: Russell Johnson <47639332+Russ4262@users.noreply.github.com>
Date: Thu, 26 Mar 2020 16:05:13 -0500
Subject: [PATCH] Path: Add `ScanType` and `LayerMode` inputs
Added combo boxes with labels
Path: Remove 'Algorithm' property usage.
Path: Connect `ScanType` and `LayerMode' selections from task panel
Path: Update GUI inputs for independent 3D Surface operation
---
.../Gui/Resources/panels/PageOpSurfaceEdit.ui | 292 ++++++++++--------
src/Mod/Path/PathScripts/PathSurfaceGui.py | 83 +++--
2 files changed, 217 insertions(+), 158 deletions(-)
diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpSurfaceEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageOpSurfaceEdit.ui
index d019e3fe67..7013dd6e28 100644
--- a/src/Mod/Path/Gui/Resources/panels/PageOpSurfaceEdit.ui
+++ b/src/Mod/Path/Gui/Resources/panels/PageOpSurfaceEdit.ui
@@ -6,8 +6,8 @@
0
0
- 357
- 427
+ 350
+ 400
@@ -57,126 +57,7 @@
-
-
-
-
-
- Algorithm
-
-
-
- -
-
-
-
-
- OCL Dropcutter
-
-
- -
-
- OCL Waterline
-
-
-
-
- -
-
-
- BoundBox
-
-
-
- -
-
-
-
-
- Stock
-
-
- -
-
- BaseBoundBox
-
-
-
-
- -
-
-
- BoundBox extra offset X, Y
-
-
-
- -
-
-
- mm
-
-
-
- -
-
-
- mm
-
-
-
- -
-
-
- Drop Cutter Direction
-
-
-
- -
-
-
-
-
- X
-
-
- -
-
- Y
-
-
-
-
- -
-
-
- Depth offset
-
-
-
- -
-
-
- mm
-
-
-
- -
-
-
- Sample interval
-
-
-
- -
-
-
- mm
-
-
-
- -
-
-
- Step over
-
-
-
- -
+
-
<html><head/><body><p>The amount by which the tool is laterally displaced on each cycle of the pattern, specified in percent of the tool diameter.</p><p>A step over of 100% results in no overlap between two different cycles.</p></body></html>
@@ -195,17 +76,174 @@
- -
-
+
-
+
- Optimize output
+ BoundBox
- -
+
-
+
+
+ Layer Mode
+
+
+
+ -
+
+
+ Depth offset
+
+
+
+ -
+
+
+ mm
+
+
+
+ -
+
+
+ Sample interval
+
+
+
+ -
+
+
-
+
+ X
+
+
+ -
+
+ Y
+
+
+
+
+ -
+
+
+ Step over
+
+
+
+ -
+
+
-
+
+ Planar
+
+
+ -
+
+ Rotational
+
+
+
+
+ -
+
+
-
+
+ Single-pass
+
+
+ -
+
+ Multi-pass
+
+
+
+
+ -
- Enabled
+ Optimize Linear Paths
+
+
+
+ -
+
+
-
+
+ Stock
+
+
+ -
+
+ BaseBoundBox
+
+
+
+
+ -
+
+
+ Optimize StepOver Transitions
+
+
+
+ -
+
+
+ mm
+
+
+
+ -
+
+
+ Scan Type
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ mm
+
+
+
+ -
+
+
+ mm
+
+
+
+
+
+ -
+
+
+ Drop Cutter Direction
+
+
+
+ -
+
+
+ BoundBox extra offset X, Y
+
+
+
+ -
+
+
+ Use Start Point
diff --git a/src/Mod/Path/PathScripts/PathSurfaceGui.py b/src/Mod/Path/PathScripts/PathSurfaceGui.py
index 40feff2c70..f11bdd4864 100644
--- a/src/Mod/Path/PathScripts/PathSurfaceGui.py
+++ b/src/Mod/Path/PathScripts/PathSurfaceGui.py
@@ -45,83 +45,104 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage):
def getFields(self, obj):
'''getFields(obj) ... transfers values from UI to obj's proprties'''
+ self.updateToolController(obj, self.form.toolController)
+ self.updateCoolant(obj, self.form.coolantController)
+
PathGui.updateInputField(obj, 'DepthOffset', self.form.depthOffset)
PathGui.updateInputField(obj, 'SampleInterval', self.form.sampleInterval)
- if obj.StepOver != self.form.stepOver.value():
- obj.StepOver = self.form.stepOver.value()
-
- if obj.Algorithm != str(self.form.algorithmSelect.currentText()):
- obj.Algorithm = str(self.form.algorithmSelect.currentText())
-
if obj.BoundBox != str(self.form.boundBoxSelect.currentText()):
obj.BoundBox = str(self.form.boundBoxSelect.currentText())
- if obj.DropCutterDir != str(self.form.dropCutterDirSelect.currentText()):
- obj.DropCutterDir = str(self.form.dropCutterDirSelect.currentText())
+ if obj.ScanType != str(self.form.scanType.currentText()):
+ obj.ScanType = str(self.form.scanType.currentText())
+
+ if obj.StepOver != self.form.stepOver.value():
+ obj.StepOver = self.form.stepOver.value()
+
+ if obj.LayerMode != str(self.form.layerMode.currentText()):
+ obj.LayerMode = str(self.form.layerMode.currentText())
obj.DropCutterExtraOffset.x = FreeCAD.Units.Quantity(self.form.boundBoxExtraOffsetX.text()).Value
obj.DropCutterExtraOffset.y = FreeCAD.Units.Quantity(self.form.boundBoxExtraOffsetY.text()).Value
+ if obj.DropCutterDir != str(self.form.dropCutterDirSelect.currentText()):
+ obj.DropCutterDir = str(self.form.dropCutterDirSelect.currentText())
+
+ PathGui.updateInputField(obj, 'DepthOffset', self.form.depthOffset)
+ PathGui.updateInputField(obj, 'SampleInterval', self.form.sampleInterval)
+
+ if obj.UseStartPoint != self.form.useStartPoint.isChecked():
+ obj.UseStartPoint = self.form.useStartPoint.isChecked()
+
if obj.OptimizeLinearPaths != self.form.optimizeEnabled.isChecked():
obj.OptimizeLinearPaths = self.form.optimizeEnabled.isChecked()
- self.updateToolController(obj, self.form.toolController)
- self.updateCoolant(obj, self.form.coolantController)
+ if obj.OptimizeStepOverTransitions != self.form.optimizeStepOverTransitions.isChecked():
+ obj.OptimizeStepOverTransitions = self.form.optimizeStepOverTransitions.isChecked()
def setFields(self, obj):
'''setFields(obj) ... transfers obj's property values to UI'''
- self.selectInComboBox(obj.Algorithm, self.form.algorithmSelect)
+ self.setupToolController(obj, self.form.toolController)
+ self.setupCoolant(obj, self.form.coolantController)
self.selectInComboBox(obj.BoundBox, self.form.boundBoxSelect)
- self.selectInComboBox(obj.DropCutterDir, self.form.dropCutterDirSelect)
-
+ self.selectInComboBox(obj.ScanType, self.form.scanType)
+ self.selectInComboBox(obj.LayerMode, self.form.layerMode)
self.form.boundBoxExtraOffsetX.setText(str(obj.DropCutterExtraOffset.x))
self.form.boundBoxExtraOffsetY.setText(str(obj.DropCutterExtraOffset.y))
+ self.selectInComboBox(obj.DropCutterDir, self.form.dropCutterDirSelect)
self.form.depthOffset.setText(FreeCAD.Units.Quantity(obj.DepthOffset.Value, FreeCAD.Units.Length).UserString)
- self.form.sampleInterval.setText(str(obj.SampleInterval))
self.form.stepOver.setValue(obj.StepOver)
+ self.form.sampleInterval.setText(str(obj.SampleInterval))
+
+ if obj.UseStartPoint:
+ self.form.useStartPoint.setCheckState(QtCore.Qt.Checked)
+ else:
+ self.form.useStartPoint.setCheckState(QtCore.Qt.Unchecked)
if obj.OptimizeLinearPaths:
self.form.optimizeEnabled.setCheckState(QtCore.Qt.Checked)
else:
self.form.optimizeEnabled.setCheckState(QtCore.Qt.Unchecked)
- self.setupToolController(obj, self.form.toolController)
- self.setupCoolant(obj, self.form.coolantController)
+ if obj.OptimizeStepOverTransitions:
+ self.form.optimizeStepOverTransitions.setCheckState(QtCore.Qt.Checked)
+ else:
+ self.form.optimizeStepOverTransitions.setCheckState(QtCore.Qt.Unchecked)
+
def getSignalsForUpdate(self, obj):
'''getSignalsForUpdate(obj) ... return list of signals for updating obj'''
signals = []
signals.append(self.form.toolController.currentIndexChanged)
- signals.append(self.form.algorithmSelect.currentIndexChanged)
+ signals.append(self.form.coolantController.currentIndexChanged)
signals.append(self.form.boundBoxSelect.currentIndexChanged)
- signals.append(self.form.dropCutterDirSelect.currentIndexChanged)
+ signals.append(self.form.scanType.currentIndexChanged)
+ signals.append(self.form.layerMode.currentIndexChanged)
signals.append(self.form.boundBoxExtraOffsetX.editingFinished)
signals.append(self.form.boundBoxExtraOffsetY.editingFinished)
- signals.append(self.form.sampleInterval.editingFinished)
- signals.append(self.form.stepOver.editingFinished)
+ signals.append(self.form.dropCutterDirSelect.currentIndexChanged)
signals.append(self.form.depthOffset.editingFinished)
+ signals.append(self.form.stepOver.editingFinished)
+ signals.append(self.form.sampleInterval.editingFinished)
+ signals.append(self.form.useStartPoint.stateChanged)
signals.append(self.form.optimizeEnabled.stateChanged)
- signals.append(self.form.coolantController.currentIndexChanged)
+ signals.append(self.form.optimizeStepOverTransitions.stateChanged)
return signals
def updateVisibility(self):
- if self.form.algorithmSelect.currentText() == "OCL Dropcutter":
- self.form.boundBoxExtraOffsetX.setEnabled(True)
- self.form.boundBoxExtraOffsetY.setEnabled(True)
- self.form.boundBoxSelect.setEnabled(True)
- self.form.dropCutterDirSelect.setEnabled(True)
- self.form.stepOver.setEnabled(True)
- else:
+ if self.form.scanType.currentText() == "Planar":
self.form.boundBoxExtraOffsetX.setEnabled(False)
self.form.boundBoxExtraOffsetY.setEnabled(False)
- self.form.boundBoxSelect.setEnabled(False)
self.form.dropCutterDirSelect.setEnabled(False)
- self.form.stepOver.setEnabled(False)
+ else:
+ self.form.boundBoxExtraOffsetX.setEnabled(True)
+ self.form.boundBoxExtraOffsetY.setEnabled(True)
+ self.form.dropCutterDirSelect.setEnabled(True)
def registerSignalHandlers(self, obj):
- self.form.algorithmSelect.currentIndexChanged.connect(self.updateVisibility)
+ self.form.scanType.currentIndexChanged.connect(self.updateVisibility)
Command = PathOpGui.SetupOperation('Surface',