diff --git a/src/Mod/Path/Gui/Resources/Path.qrc b/src/Mod/Path/Gui/Resources/Path.qrc
index e156631b80..1dd5e481ae 100644
--- a/src/Mod/Path/Gui/Resources/Path.qrc
+++ b/src/Mod/Path/Gui/Resources/Path.qrc
@@ -50,7 +50,6 @@
icons/Path-Area-View.svg
icons/Path-Area-Workplane.svg
icons/preferences-path.svg
- panels/ContourEdit.ui
panels/DlgJobChooser.ui
panels/DlgJobCreate.ui
panels/DlgSelectPostProcessor.ui
diff --git a/src/Mod/Path/Gui/Resources/panels/ContourEdit.ui b/src/Mod/Path/Gui/Resources/panels/ContourEdit.ui
deleted file mode 100644
index 4b383f8a89..0000000000
--- a/src/Mod/Path/Gui/Resources/panels/ContourEdit.ui
+++ /dev/null
@@ -1,189 +0,0 @@
-
-
- TaskPanel
-
-
-
- 0
- 0
- 445
- 451
-
-
-
-
- 0
- 400
-
-
-
- Contour
-
-
- -
-
-
- 0
-
-
-
-
- 0
- 0
- 427
- 396
-
-
-
-
- :/icons/Path-OperationB.svg:/icons/Path-OperationB.svg
-
-
- Operation
-
-
-
- QFormLayout::AllNonFixedFieldsGrow
-
-
-
-
-
-
-
-
-
- Direction
-
-
-
- -
-
-
-
-
- CW
-
-
- -
-
- CCW
-
-
-
-
-
-
-
- -
-
-
-
- 0
-
-
- 0
-
-
-
-
-
- Use Start Point
-
-
-
- -
-
-
- Use Compensation
-
-
-
-
-
-
- -
-
-
-
- 0
-
-
- 0
-
-
-
-
-
- Extra Offset
-
-
-
- -
-
-
- 0.000000000000000
-
-
- mm
-
-
-
-
-
-
- -
-
-
- QFrame::StyledPanel
-
-
- QFrame::Raised
-
-
-
- 0
-
-
- 0
-
-
-
-
-
- ToolController
-
-
-
- -
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
-
-
-
-
-
-
-
-
- Gui::InputField
- QLineEdit
-
-
-
-
-
-
-
-
-
diff --git a/src/Mod/Path/Gui/Resources/panels/PageDepthsEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageDepthsEdit.ui
index 39893dac82..0baef83a6d 100644
--- a/src/Mod/Path/Gui/Resources/panels/PageDepthsEdit.ui
+++ b/src/Mod/Path/Gui/Resources/panels/PageDepthsEdit.ui
@@ -15,7 +15,7 @@
-
-
+
-
@@ -25,7 +25,7 @@
-
-
+
-
@@ -35,7 +35,7 @@
-
-
+
-
@@ -46,6 +46,13 @@
+
+
+ Gui::InputField
+ QLineEdit
+
+
+
diff --git a/src/Mod/Path/PathScripts/PathAreaOpGui.py b/src/Mod/Path/PathScripts/PathAreaOpGui.py
index 683f2217ab..d51cea80b4 100644
--- a/src/Mod/Path/PathScripts/PathAreaOpGui.py
+++ b/src/Mod/Path/PathScripts/PathAreaOpGui.py
@@ -87,7 +87,7 @@ class TaskPanelPage(object):
self.isdirty = False
def pageGetFields(self):
- self.getFields(self, obj)
+ self.getFields(self.obj)
self.setDirty()
def pageSetFields(self):
@@ -105,21 +105,37 @@ class TaskPanelPage(object):
class TaskPanelHeightsPage(TaskPanelPage):
def getForm(self):
return FreeCADGui.PySideUic.loadUi(":/panels/PageHeightsEdit.ui")
-
def getTitle(self, obj):
return translate("Path_AreaOp", "Heights")
-
def getFields(self, obj):
obj.SafeHeight = FreeCAD.Units.Quantity(self.form.safeHeight.text()).Value
obj.ClearanceHeight = FreeCAD.Units.Quantity(self.form.clearanceHeight.text()).Value
-
def setFields(self, obj):
self.form.safeHeight.setText(FreeCAD.Units.Quantity(obj.SafeHeight.Value, FreeCAD.Units.Length).UserString)
self.form.clearanceHeight.setText(FreeCAD.Units.Quantity(obj.ClearanceHeight.Value, FreeCAD.Units.Length).UserString)
-
def getSignalsForUpdate(self, obj):
return [self.form.safeHeight.editingFinished, self.form.clearanceHeight.editingFinished]
+class TaskPanelDepthsPage(TaskPanelPage):
+ def getForm(self):
+ return FreeCADGui.PySideUic.loadUi(":/panels/PageDepthsEdit.ui")
+ def getTitle(self, obj):
+ return translate("PathAreaOp", "Depths")
+ def getFields(self, obj):
+ obj.StartDepth = FreeCAD.Units.Quantity(self.form.startDepth.text()).Value
+ obj.FinalDepth = FreeCAD.Units.Quantity(self.form.finalDepth.text()).Value
+ obj.StepDown = FreeCAD.Units.Quantity(self.form.stepDown.text()).Value
+ def setFields(self, obj):
+ self.form.startDepth.setText(FreeCAD.Units.Quantity(obj.StartDepth.Value, FreeCAD.Units.Length).UserString)
+ self.form.finalDepth.setText(FreeCAD.Units.Quantity(obj.FinalDepth.Value, FreeCAD.Units.Length).UserString)
+ self.form.stepDown.setText(FreeCAD.Units.Quantity(obj.StepDown.Value, FreeCAD.Units.Length).UserString)
+ def getSignalsForUpdate(self, obj):
+ signals = []
+ signals.append(self.form.startDepth.editingFinished)
+ signals.append(self.form.finalDepth.editingFinished)
+ signals.append(self.form.stepDown.editingFinished)
+ return signals
+
class TaskPanel(object):
def __init__(self, obj, deleteOnReject, page, selectionFactory):
@@ -128,6 +144,9 @@ class TaskPanel(object):
self.deleteOnReject = deleteOnReject
self.featurePages = []
+ if PathAreaOp.FeatureDepths & obj.Proxy.opFeatures(obj):
+ self.featurePages.append(TaskPanelDepthsPage(obj))
+
if PathAreaOp.FeatureHeights & obj.Proxy.opFeatures(obj):
self.featurePages.append(TaskPanelHeightsPage(obj))
@@ -180,8 +199,7 @@ class TaskPanel(object):
def panelGetFields(self):
PathLog.track()
for page in self.featurePages:
- page.pageGetFields(self.obj)
- self.opGetFields(self.obj)
+ page.pageGetFields()
def panelSetFields(self):
PathLog.track()