From 7fd047a9beebe8400ff2bebecc5b314254b45487 Mon Sep 17 00:00:00 2001
From: Russell Johnson <47639332+Russ4262@users.noreply.github.com>
Date: Wed, 3 Jun 2020 01:29:08 -0500
Subject: [PATCH] Path: Make missing connections between UI panel and operation

---
 .../Gui/Resources/panels/PageOpSurfaceEdit.ui |  2 +-
 src/Mod/Path/PathScripts/PathSurfaceGui.py    | 20 +++++++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpSurfaceEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageOpSurfaceEdit.ui
index 45902b44ff..e39c46b7bc 100644
--- a/src/Mod/Path/Gui/Resources/panels/PageOpSurfaceEdit.ui
+++ b/src/Mod/Path/Gui/Resources/panels/PageOpSurfaceEdit.ui
@@ -156,7 +156,7 @@
        </widget>
       </item>
       <item row="4" column="1" colspan="2">
-       <widget class="QComboBox" name="comboBox">
+       <widget class="QComboBox" name="profileEdges">
         <property name="toolTip">
          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Profile the edges of the selection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
diff --git a/src/Mod/Path/PathScripts/PathSurfaceGui.py b/src/Mod/Path/PathScripts/PathSurfaceGui.py
index a26b290827..ab09c33d6f 100644
--- a/src/Mod/Path/PathScripts/PathSurfaceGui.py
+++ b/src/Mod/Path/PathScripts/PathSurfaceGui.py
@@ -52,24 +52,24 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage):
         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.BoundBox != str(self.form.boundBoxSelect.currentText()):
             obj.BoundBox = str(self.form.boundBoxSelect.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())
 
         if obj.CutPattern != str(self.form.cutPattern.currentText()):
             obj.CutPattern = str(self.form.cutPattern.currentText())
 
+        if obj.ProfileEdges != str(self.form.profileEdges.currentText()):
+            obj.ProfileEdges = str(self.form.profileEdges.currentText())
+
+        if obj.AvoidLastX_Faces != self.form.avoidLastX_Faces.value():
+            obj.AvoidLastX_Faces = self.form.avoidLastX_Faces.value()
+
         obj.DropCutterExtraOffset.x = FreeCAD.Units.Quantity(self.form.boundBoxExtraOffsetX.text()).Value
         obj.DropCutterExtraOffset.y = FreeCAD.Units.Quantity(self.form.boundBoxExtraOffsetY.text()).Value
 
@@ -77,6 +77,10 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage):
             obj.DropCutterDir = str(self.form.dropCutterDirSelect.currentText())
 
         PathGui.updateInputField(obj, 'DepthOffset', self.form.depthOffset)
+
+        if obj.StepOver != self.form.stepOver.value():
+            obj.StepOver = self.form.stepOver.value()
+
         PathGui.updateInputField(obj, 'SampleInterval', self.form.sampleInterval)
 
         if obj.UseStartPoint != self.form.useStartPoint.isChecked():
@@ -96,6 +100,8 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage):
         self.selectInComboBox(obj.ScanType, self.form.scanType)
         self.selectInComboBox(obj.LayerMode, self.form.layerMode)
         self.selectInComboBox(obj.CutPattern, self.form.cutPattern)
+        self.selectInComboBox(obj.ProfileEdges, self.form.profileEdges)
+        self.form.avoidLastX_Faces.setValue(obj.AvoidLastX_Faces)
         self.form.boundBoxExtraOffsetX.setText(FreeCAD.Units.Quantity(obj.DropCutterExtraOffset.x, FreeCAD.Units.Length).UserString)
         self.form.boundBoxExtraOffsetY.setText(FreeCAD.Units.Quantity(obj.DropCutterExtraOffset.y, FreeCAD.Units.Length).UserString)
         self.selectInComboBox(obj.DropCutterDir, self.form.dropCutterDirSelect)
@@ -129,6 +135,8 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage):
         signals.append(self.form.scanType.currentIndexChanged)
         signals.append(self.form.layerMode.currentIndexChanged)
         signals.append(self.form.cutPattern.currentIndexChanged)
+        signals.append(self.form.profileEdges.currentIndexChanged)
+        signals.append(self.form.avoidLastX_Faces.editingFinished)
         signals.append(self.form.boundBoxExtraOffsetX.editingFinished)
         signals.append(self.form.boundBoxExtraOffsetY.editingFinished)
         signals.append(self.form.dropCutterDirSelect.currentIndexChanged)