From 532e869041d1e1f953632db5424ba933af94c851 Mon Sep 17 00:00:00 2001 From: Daniel Wood Date: Sat, 18 Apr 2020 12:03:57 +0100 Subject: [PATCH 1/2] don't hide the join type --- src/Mod/Path/PathScripts/PathDeburrGui.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Mod/Path/PathScripts/PathDeburrGui.py b/src/Mod/Path/PathScripts/PathDeburrGui.py index 6334b6e9fc..878a349323 100644 --- a/src/Mod/Path/PathScripts/PathDeburrGui.py +++ b/src/Mod/Path/PathScripts/PathDeburrGui.py @@ -86,7 +86,6 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage): self.setupCoolant(obj, self.form.coolantController) self.form.joinRound.setChecked('Round' == obj.Join) self.form.joinMiter.setChecked('Miter' == obj.Join) - self.form.joinFrame.hide() self.selectInComboBox(obj.Direction, self.form.direction) def updateWidth(self): From d0d9888b9d6fda16940b57471e791211dba8a4bf Mon Sep 17 00:00:00 2001 From: Daniel Wood Date: Sat, 18 Apr 2020 12:17:14 +0100 Subject: [PATCH 2/2] Hide the join type. --- .../Gui/Resources/panels/PageOpDeburrEdit.ui | 326 +++++++++--------- src/Mod/Path/PathScripts/PathDeburrGui.py | 1 + 2 files changed, 172 insertions(+), 155 deletions(-) diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpDeburrEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageOpDeburrEdit.ui index 31eb02df70..9cea10b7ef 100644 --- a/src/Mod/Path/Gui/Resources/panels/PageOpDeburrEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/PageOpDeburrEdit.ui @@ -6,8 +6,8 @@ 0 0 - 321 - 529 + 350 + 450 @@ -173,166 +173,182 @@ 16777215 - - - - - QLayout::SetDefaultConstraint - + + + - - - - - - - - 50 - 0 - - - - W = - - - - - - - <html><head/><body><p>Width of chamfer cut.</p></body></html> - - - mm - - - - - - - - - - - - 50 - 0 - - - - h = - - - - - - - <html><head/><body><p>Extra depth of tool immersion.</p></body></html> - - - mm - - - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 10 - - - - - - - - - - - 50 - 0 - - - - Join: - - - - - - - <html><head/><body><p>Round joint</p></body></html> - - - - - - true - - - true - - - true - - - - - - - <html><head/><body><p>Miter joint</p></body></html> - - - - - - true - - - true - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - Qt::Vertical - - + + - 20 - 40 + 50 + 0 - + + W = + + + + + + + <html><head/><body><p>Width of chamfer cut.</p></body></html> + + + mm + + + + + + + + + 50 + 0 + + + + h = + + + + + + + <html><head/><body><p>Extra depth of tool immersion.</p></body></html> + + + mm + + + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 13 + + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 0 + + + 6 + + + 0 + + + 3 + + + 3 + + + + + + + + 50 + 0 + + + + Join: + + + + + + + <html><head/><body><p>Round joint</p></body></html> + + + + + + true + + + true + + + true + + + + + + + <html><head/><body><p>Miter joint</p></body></html> + + + + + + true + + + true + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + Qt::Vertical + + + + 20 + 154 + + + + diff --git a/src/Mod/Path/PathScripts/PathDeburrGui.py b/src/Mod/Path/PathScripts/PathDeburrGui.py index 878a349323..6334b6e9fc 100644 --- a/src/Mod/Path/PathScripts/PathDeburrGui.py +++ b/src/Mod/Path/PathScripts/PathDeburrGui.py @@ -86,6 +86,7 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage): self.setupCoolant(obj, self.form.coolantController) self.form.joinRound.setChecked('Round' == obj.Join) self.form.joinMiter.setChecked('Miter' == obj.Join) + self.form.joinFrame.hide() self.selectInComboBox(obj.Direction, self.form.direction) def updateWidth(self):