From a337653d2be0ea33affa0d8c4239d1306d4532e0 Mon Sep 17 00:00:00 2001
From: Russell Johnson <47639332+Russ4262@users.noreply.github.com>
Date: Mon, 25 May 2020 18:34:26 -0500
Subject: [PATCH] Path: Add missing `CoolantMode` input to GUI
---
.../Resources/panels/PageOpWaterlineEdit.ui | 30 ++++++++++++++++---
src/Mod/Path/PathScripts/PathWaterlineGui.py | 3 ++
2 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpWaterlineEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageOpWaterlineEdit.ui
index 412b32b6d000..a9cdcac0ea55 100644
--- a/src/Mod/Path/Gui/Resources/panels/PageOpWaterlineEdit.ui
+++ b/src/Mod/Path/Gui/Resources/panels/PageOpWaterlineEdit.ui
@@ -22,21 +22,31 @@
QFrame::Raised
-
- -
-
+
+
-
+
ToolController
- -
+
-
<html><head/><body><p>The tool and its settings to be used for this operation.</p></body></html>
+ -
+
+
+ -
+
+
+ Coolant Mode
+
+
+
@@ -279,6 +289,18 @@
+
+ toolController
+ coolantController
+ algorithmSelect
+ boundBoxSelect
+ layerMode
+ cutPattern
+ boundaryAdjustment
+ stepOver
+ sampleInterval
+ optimizeEnabled
+
diff --git a/src/Mod/Path/PathScripts/PathWaterlineGui.py b/src/Mod/Path/PathScripts/PathWaterlineGui.py
index ad4e06ba932e..8ab8ea5698b8 100644
--- a/src/Mod/Path/PathScripts/PathWaterlineGui.py
+++ b/src/Mod/Path/PathScripts/PathWaterlineGui.py
@@ -51,6 +51,7 @@ def getForm(self):
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)
if obj.Algorithm != str(self.form.algorithmSelect.currentText()):
obj.Algorithm = str(self.form.algorithmSelect.currentText())
@@ -77,6 +78,7 @@ def getFields(self, obj):
def setFields(self, obj):
'''setFields(obj) ... transfers obj's property values to UI'''
self.setupToolController(obj, self.form.toolController)
+ self.setupCoolant(obj, self.form.coolantController)
self.selectInComboBox(obj.Algorithm, self.form.algorithmSelect)
self.selectInComboBox(obj.BoundBox, self.form.boundBoxSelect)
self.selectInComboBox(obj.LayerMode, self.form.layerMode)
@@ -96,6 +98,7 @@ def getSignalsForUpdate(self, obj):
'''getSignalsForUpdate(obj) ... return list of signals for updating obj'''
signals = []
signals.append(self.form.toolController.currentIndexChanged)
+ signals.append(self.form.coolantController.currentIndexChanged)
signals.append(self.form.algorithmSelect.currentIndexChanged)
signals.append(self.form.boundBoxSelect.currentIndexChanged)
signals.append(self.form.layerMode.currentIndexChanged)