From 15318f4957ffc384e89ef0ced2dc757e8f5b9922 Mon Sep 17 00:00:00 2001 From: Daniel Wood Date: Sun, 12 Apr 2020 06:33:34 +0100 Subject: [PATCH 1/2] Deburr: signal for update when values are changed --- src/Mod/Path/PathScripts/PathDeburrGui.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Mod/Path/PathScripts/PathDeburrGui.py b/src/Mod/Path/PathScripts/PathDeburrGui.py index ed25c644fa..6334b6e9fc 100644 --- a/src/Mod/Path/PathScripts/PathDeburrGui.py +++ b/src/Mod/Path/PathScripts/PathDeburrGui.py @@ -101,6 +101,8 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage): signals.append(self.form.joinRound.clicked) signals.append(self.form.coolantController.currentIndexChanged) signals.append(self.form.direction.currentIndexChanged) + signals.append(self.form.value_W.valueChanged) + signals.append(self.form.value_h.valueChanged) return signals def registerSignalHandlers(self, obj): From dd7e3ec729ca936c52813fb738acf4bbe42a4b63 Mon Sep 17 00:00:00 2001 From: Daniel Wood Date: Sun, 12 Apr 2020 08:04:32 +0100 Subject: [PATCH 2/2] Ensure join type is shown --- .../Gui/Resources/panels/PageOpDeburrEdit.ui | 553 ++++++++++-------- 1 file changed, 318 insertions(+), 235 deletions(-) diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpDeburrEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageOpDeburrEdit.ui index 452e6ab7e3..31eb02df70 100644 --- a/src/Mod/Path/Gui/Resources/panels/PageOpDeburrEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/PageOpDeburrEdit.ui @@ -6,14 +6,14 @@ 0 0 - 399 - 333 + 321 + 529 Form - + @@ -31,6 +31,24 @@ + + + 0 + 0 + + + + + 125 + 0 + + + + + 16777215 + 16777215 + + Tool Controller @@ -45,6 +63,24 @@ + + + 0 + 0 + + + + + 125 + 0 + + + + + 16777215 + 16777215 + + Coolant Mode @@ -60,254 +96,301 @@ + + + + 6 + + + 12 + + + 12 + + + + + + 0 + 0 + + + + + 125 + 0 + + + + + 16777215 + 16777215 + + + + Direction + + + + + + + <html><head/><body><p>The direction in which the profile is performed, clockwise or counter clockwise.</p></body></html> + + + CW + + + 0 + + + + CW + + + + + CCW + + + + + + - - - - - - - 0 - - - 0 - - - 0 - - - 9 - - - - - - QFormLayout::AllNonFixedFieldsGrow - - - - - W = - - + + + + + + 125 + 0 + + + + + 16777215 + 16777215 + + + + + + + QLayout::SetDefaultConstraint + + + + + + + + + + 50 + 0 + + + + W = + + + + + + + <html><head/><body><p>Width of chamfer cut.</p></body></html> + + + mm + + + + - - - - <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 + + + + - - - - h = - - - - - - - <html><head/><body><p>Extra depth of tool immersion.</p></body></html> - - - mm - - - - - - - - - - - - - Join: - - - - - + + - Qt::Horizontal + Qt::Vertical + + + QSizePolicy::Fixed - 40 - 20 + 20 + 10 - - - - <html><head/><body><p>Miter joint</p></body></html> - - - - - - true - - - true - - - - - - - <html><head/><body><p>Round joint</p></body></html> - - - - - - true - - - true - - - true - - + + + + + + + 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 + + + + + - - - - - - - - - - - - 0 - 0 - - - - - 150 - 150 - - - - - 150 - 150 - - - - TextLabel - - - true - - - Qt::AlignCenter - - - - - - - Qt::Vertical - - - - 20 - 40 - - - + + + + + Qt::Vertical + + + + 20 + 40 + + + + + - - - - - - - - - 9 - - - 9 - - - 9 - - - 9 - - - 8 - - - - - <html><head/><body><p>The direction in which the profile is performed, clockwise or counter clockwise.</p></body></html> - - - CW - - - 0 - - - - CW - + + + + + + + + + + + + 0 + 0 + + + + + 150 + 150 + + + + + 150 + 150 + + + + TextLabel + + + true + + + Qt::AlignCenter + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + - - - CCW - - - - - - - - - 0 - 0 - - - - Direction - - - - - - - Qt::Horizontal - - - QSizePolicy::Preferred - - - - 30 - 20 - - - - - - + + + +