diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpSurfaceEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageOpSurfaceEdit.ui
index bb14461cc4..45902b44ff 100644
--- a/src/Mod/Path/Gui/Resources/panels/PageOpSurfaceEdit.ui
+++ b/src/Mod/Path/Gui/Resources/panels/PageOpSurfaceEdit.ui
@@ -7,7 +7,7 @@
0
0
368
- 400
+ 442
@@ -57,142 +57,24 @@
-
-
-
-
-
- <html><head/><body><p>Planar: Flat, 3D surface scan. Rotational: 4th-axis rotational scan.</p></body></html>
-
-
-
-
- Planar
-
-
- -
-
- Rotational
-
-
-
-
- -
-
-
- <html><head/><body><p>Complete the operation in a single pass at depth, or mulitiple passes to final depth.</p></body></html>
-
-
-
-
- Single-pass
-
-
- -
-
- Multi-pass
-
-
-
-
- -
-
-
- <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>
-
-
- 1
-
-
- 100
-
-
- 10
-
-
- 100
-
-
-
- -
-
+
-
+
- Step over
+ Cut Pattern
- -
+
-
Sample interval
- -
-
-
- Layer Mode
-
-
-
- -
-
-
- <html><head/><body><p>Enable optimization of linear paths (co-linear points). Removes unnecessary co-linear points from G-Code output.</p></body></html>
-
-
- Optimize Linear Paths
-
-
-
- -
-
-
- Drop Cutter Direction
-
-
-
- -
-
-
- BoundBox extra offset X, Y
-
-
-
- -
-
-
- <html><head/><body><p>Make True, if specifying a Start Point</p></body></html>
-
-
- Use Start Point
-
-
-
- -
-
-
- Scan Type
-
-
-
- -
-
-
- BoundBox
-
-
-
- -
-
-
- <html><head/><body><p>Set the Z-axis depth offset from the target surface.</p></body></html>
-
-
- mm
-
-
-
- -
+
-
-
-
+
0
@@ -208,7 +90,7 @@
-
-
+
<html><head/><body><p>Additional offset to the selected bounding box along the Y axis."</p></body></html>
@@ -219,8 +101,8 @@
- -
-
+
-
+
<html><head/><body><p>Set the sampling resolution. Smaller values quickly increase processing time.</p></body></html>
@@ -229,28 +111,21 @@
- -
-
+
-
+
+
+ <html><head/><body><p>Enable optimization of linear paths (co-linear points). Removes unnecessary co-linear points from G-Code output.</p></body></html>
+
- Depth offset
+ Optimize Linear Paths
- -
-
-
- <html><head/><body><p>Dropcutter lines are created parallel to this axis.</p></body></html>
+
-
+
+
+ BoundBox
-
-
-
- X
-
-
- -
-
- Y
-
-
-
@@ -270,7 +145,7 @@
- -
+
-
<html><head/><body><p>Enable separate optimization of transitions between, and breaks within, each step over path.</p></body></html>
@@ -280,10 +155,37 @@
- -
-
+
-
+
+
+ <html><head/><body><p>Profile the edges of the selection.</p></body></html>
+
+
-
+
+ None
+
+
+ -
+
+ Only
+
+
+ -
+
+ First
+
+
+ -
+
+ Last
+
+
+
+
+ -
+
- Cut Pattern
+ Step over
@@ -324,6 +226,146 @@
+ -
+
+
+ <html><head/><body><p>Planar: Flat, 3D surface scan. Rotational: 4th-axis rotational scan.</p></body></html>
+
+
-
+
+ Planar
+
+
+ -
+
+ Rotational
+
+
+
+
+ -
+
+
+ BoundBox extra offset X, Y
+
+
+
+ -
+
+
+ Depth offset
+
+
+
+ -
+
+
+ <html><head/><body><p>Complete the operation in a single pass at depth, or mulitiple passes to final depth.</p></body></html>
+
+
-
+
+ Single-pass
+
+
+ -
+
+ Multi-pass
+
+
+
+
+ -
+
+
+ Layer Mode
+
+
+
+ -
+
+
+ Scan Type
+
+
+
+ -
+
+
+ <html><head/><body><p>Dropcutter lines are created parallel to this axis.</p></body></html>
+
+
-
+
+ X
+
+
+ -
+
+ Y
+
+
+
+
+ -
+
+
+ <html><head/><body><p>Set the Z-axis depth offset from the target surface.</p></body></html>
+
+
+ mm
+
+
+
+ -
+
+
+ Drop Cutter Direction
+
+
+
+ -
+
+
+ <html><head/><body><p>Make True, if specifying a Start Point</p></body></html>
+
+
+ Use Start Point
+
+
+
+ -
+
+
+ <html><head/><body><p>Avoid cutting the last 'N' faces in the Base Geometry list of selected faces.</p></body></html>
+
+
+
+ -
+
+
+ Profile Edges
+
+
+
+ -
+
+
+ Avoid Last X Faces
+
+
+
+ -
+
+
+ <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>
+
+
+ 1
+
+
+ 100
+
+
+
diff --git a/src/Mod/Path/PathScripts/PathSurfaceGui.py b/src/Mod/Path/PathScripts/PathSurfaceGui.py
index 7ff1342360..a26b290827 100644
--- a/src/Mod/Path/PathScripts/PathSurfaceGui.py
+++ b/src/Mod/Path/PathScripts/PathSurfaceGui.py
@@ -141,11 +141,17 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage):
return signals
- def updateVisibility(self):
+ def updateVisibility(self, sentObj=None):
+ '''updateVisibility(sentObj=None)... Updates visibility of Tasks panel objects.'''
if self.form.scanType.currentText() == 'Planar':
self.form.cutPattern.show()
self.form.cutPattern_label.show()
self.form.optimizeStepOverTransitions.show()
+ if hasattr(self.form, 'profileEdges'):
+ self.form.profileEdges.show()
+ self.form.profileEdges_label.show()
+ self.form.avoidLastX_Faces.show()
+ self.form.avoidLastX_Faces_label.show()
self.form.boundBoxExtraOffsetX.hide()
self.form.boundBoxExtraOffsetY.hide()
@@ -156,6 +162,11 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage):
self.form.cutPattern.hide()
self.form.cutPattern_label.hide()
self.form.optimizeStepOverTransitions.hide()
+ if hasattr(self.form, 'profileEdges'):
+ self.form.profileEdges.hide()
+ self.form.profileEdges_label.hide()
+ self.form.avoidLastX_Faces.hide()
+ self.form.avoidLastX_Faces_label.hide()
self.form.boundBoxExtraOffsetX.show()
self.form.boundBoxExtraOffsetY.show()