From 114166a0e3b6d30c44740fe140391fbcec90a64e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Insaurralde=20Avalos?= <36372335+adrianinsaval@users.noreply.github.com> Date: Mon, 24 Jun 2024 11:44:13 -0400 Subject: [PATCH] PD: improve hole dialog layout (#14031) --- src/Mod/PartDesign/Gui/TaskHoleParameters.ui | 1656 ++++++++++-------- 1 file changed, 906 insertions(+), 750 deletions(-) diff --git a/src/Mod/PartDesign/Gui/TaskHoleParameters.ui b/src/Mod/PartDesign/Gui/TaskHoleParameters.ui index 002fcff2f5..f8ee6605bf 100644 --- a/src/Mod/PartDesign/Gui/TaskHoleParameters.ui +++ b/src/Mod/PartDesign/Gui/TaskHoleParameters.ui @@ -6,8 +6,8 @@ 0 0 - 438 - 561 + 394 + 702 @@ -20,730 +20,750 @@ Task Hole Parameters - - - - <b>Threading and size</b> - - + + + + + + + 0 + 0 + + + + Profile + + + + + + + + 0 + 0 + + + + + - - - - - 0 - 0 - - - - Profile - - - - - - - - 0 - 0 - - - - - - - - - 0 - 0 - - - - Whether the hole gets a thread - - - Threaded - - - - - - - - 0 - 0 - - - - Whether the hole gets a modelled thread - - - Model Thread - - - - - - - true - - - Live update of changes to the thread -Note that the calculation can take some time - - - Update view - - - - - - - - 0 - 0 - - - - Customize thread clearance - - - Custom Thread - - - - - - - - 0 - 0 - - - - Clearance - - - - - - - - 0 - 0 - - - - Custom Thread clearance value - - - false - - - mm - - - 0.100000000000000 - - - - - - - - 0 - 0 - - - - Direction - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - - - 0 - 0 - - - - - - - Right hand - - - directionButtonGroup - - - - - - - - 0 - 0 - - - - Left hand - - - directionButtonGroup - - - - - - - - 0 - 0 - - - - Size - - - - - - - - 0 - 0 - - - - - - - - - 0 - 0 - - - - Clearance - - - - - - - - 0 - 0 - - - - Hole clearance + + + + + + + + + 0 + 0 + + + + Size + + + + + + + + 0 + 0 + + + + + + + + + + + + + 0 + 0 + + + + Clearance + + + + + + + + 0 + 0 + + + + Hole clearance Only available for holes without thread - - - - Standard - + + + + Standard + + + + + Close + + + + + Wide + + + + + - - - Close - + + + + + 0 + 0 + + + + Diameter + + - - - Wide - + + + + + 0 + 0 + + + + Hole diameter + + + false + + + mm + + + 0.000000000000000 + + - - - - - - - 0 - 0 - - - - Class - - - - - - - - 0 - 0 - - - - Tolerance class for threaded holes according to hole profile - - - - - - - - 0 - 0 - - - - Diameter - - - - - - - - 0 - 0 - - - - Hole diameter - - - false - - - mm - - - 0.000000000000000 - - - - - - - - 0 - 0 - - - - Depth - - - - - - - - 0 - 0 - - - - - Dimension - + + + + + + + 0 + 0 + + + + Depth + + + + + + + + 0 + 0 + + + + + Dimension + + + + + Through all + + + + + - - - Through all - + + + + + 0 + 0 + + + + false + + + mm + + - - - - - - - 0 - 0 - - - - false - - - mm - - - - - - - - 0 - 0 - - - - Thread Depth - - - - - - - - 0 - 0 - - - - - Hole depth - + + + + + + + 0 + 0 + + + + Reverses the hole direction + + + Reversed + + + + + + + + 0 + 0 + + + + Tapered + + + + - - - Dimension - - - - - Tapped (DIN76) - - - - - - - - - 0 - 0 - - - - false - - - mm - - - - - - - <b>Hole cut</b> - - - - - - - - 0 - 0 - - - - Type - - - - - - - - 0 - 0 - - - - Cut type for screw heads - - - - - - - - 0 - 0 - - - - Check to override the values predefined by the 'Type' - - - Custom values - - - - - - - - 0 - 0 - - - - Diameter - - - - - - - - 0 - 0 - - - - Qt::NoContextMenu - - - false - - - mm - - - 0.000000000000000 - - - 0.100000000000000 - - - - - - - - 0 - 0 - - - - Depth - - - - - - - - 0 - 0 - - - - For countersinks this is the depth of -the screw's top below the surface - - - false - - - mm - - - 0.000000000000000 - - - 0.100000000000000 - - - - - - - - 0 - 0 - - - - Countersink angle - - - - - - - - 0 - 0 - - - - false - - - deg - - - 0.000000000000000 - - - - - - - - 0 - 0 - - - - <b>Drill point</b> - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - - - 0 - 0 - - - - Type - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - - - 0 - 0 - - - - Flat - - - drillPointButtonGroup - - - - - - - - 0 - 0 - - - - Angled - - - drillPointButtonGroup - - - - - - - - 0 - 0 - - - - false - - - deg - - - 0.000000000000000 - - - - - - - - 0 - 0 - - - - The size of the drill point will be taken into -account for the depth of blind holes - - - Take into account for depth - - - - - - - <b>Misc</b> - - - - - - - - 0 - 0 - - - - Tapered - - - - - - - - 0 - 0 - - - - Taper angle for the hole + + + + + 0 + 0 + + + + Taper angle for the hole 90 degree: straight hole under 90: smaller hole radius at the bottom over 90: larger hole radius at the bottom + + + false + + + deg + + + 0.000000000000000 + + + + + + + + + - - false - - - deg - - - 0.000000000000000 - + + + + + + + + 0 + 0 + + + + Whether the hole gets a thread + + + Threaded + + + + + + + + 0 + 0 + + + + Class + + + + + + + + + + 0 + 0 + + + + Tolerance class for threaded holes according to hole profile + + + + + + + + + + 0 + 0 + + + + Depth + + + + + + + + 0 + 0 + + + + + Hole depth + + + + + Dimension + + + + + Tapped (DIN76) + + + + + + + + + + + 0 + 0 + + + + false + + + mm + + + + + + + + + + 0 + 0 + + + + Direction + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + + 0 + 0 + + + + Left hand + + + directionButtonGroup + + + + + + + + + + 0 + 0 + + + + + + + Right hand + + + directionButtonGroup + + + + + + + + 0 + 0 + + + + Whether the hole gets a modelled thread + + + Model Thread + + + + + + + true + + + + 0 + 0 + + + + Live update of changes to the thread +Note that the calculation can take some time + + + Update thread view + + + + + + + + 0 + 0 + + + + Customize thread clearance + + + Custom Clearance + + + + + + + + 0 + 0 + + + + Custom Thread clearance value + + + false + + + mm + + + 0.100000000000000 + + + + - - - - - 0 - 0 - + + + + - - Reverses the hole direction - - - Reversed + + + + + + 0 + 0 + + + + Hole Cut Type + + + + + + + + 0 + 0 + + + + Cut type for screw heads + + + + + + + + 0 + 0 + + + + Diameter + + + + + + + + 0 + 0 + + + + Qt::NoContextMenu + + + false + + + mm + + + 0.000000000000000 + + + 0.100000000000000 + + + + + + + + 0 + 0 + + + + Depth + + + + + + + + 0 + 0 + + + + For countersinks this is the depth of +the screw's top below the surface + + + false + + + mm + + + 0.000000000000000 + + + 0.100000000000000 + + + + + + + + 0 + 0 + + + + Countersink angle + + + + + + + + 0 + 0 + + + + false + + + deg + + + 0.000000000000000 + + + + + + + + 0 + 0 + + + + Check to override the values predefined by the 'Type' + + + Custom values + + + + + + + + + + + + + + + + + + 0 + 0 + + + + Drill Point + + + + + + + + 0 + 0 + + + + Flat + + + drillPointButtonGroup + + + + + + + + 0 + 0 + + + + Angled + + + drillPointButtonGroup + + + + + + + + 0 + 0 + + + + false + + + deg + + + 0.000000000000000 + + + + + + + + + + 0 + 0 + + + + The size of the drill point will be taken into +account for the depth of blind holes + + + Take into account for depth + + + + @@ -760,83 +780,219 @@ over 90: larger hole radius at the bottom
Gui/PrefWidgets.h
- - ThreadType - Threaded - directionRightHand - directionLeftHand - ThreadSize - ThreadFit - ThreadClass - Diameter - DepthType - Depth - HoleCutType - HoleCutCustomValues - HoleCutDiameter - HoleCutDepth - HoleCutCountersinkAngle - drillPointFlat - drillPointAngled - DrillPointAngle - DrillForDepth - Tapered - TaperedAngle - Reversed - Tapered - clicked(bool) + toggled(bool) TaperedAngle setEnabled(bool) - 40 - 540 + 137 + 187 - 136 - 540 + 345 + 192 Threaded - clicked(bool) + toggled(bool) ThreadClass setEnabled(bool) - 136 - 63 + 151 + 260 - 136 - 280 + 338 + 265 Threaded - clicked(bool) + toggled(bool) ThreadFit + setDisabled(bool) + + + 151 + 260 + + + 390 + 77 + + + + + Threaded + toggled(bool) + directionLeftHand setEnabled(bool) - 136 - 63 + 85 + 249 - 322 - 254 + 151 + 323 + + + + + Threaded + toggled(bool) + directionRightHand + setEnabled(bool) + + + 85 + 249 + + + 336 + 323 + + + + + UseCustomThreadClearance + toggled(bool) + CustomThreadClearance + setEnabled(bool) + + + 113 + 384 + + + 259 + 382 + + + + + ModelThread + toggled(bool) + UseCustomThreadClearance + setVisible(bool) + + + 85 + 353 + + + 80 + 381 + + + + + ModelThread + toggled(bool) + CustomThreadClearance + setVisible(bool) + + + 127 + 358 + + + 274 + 396 + + + + + ModelThread + toggled(bool) + UpdateView + setVisible(bool) + + + 170 + 358 + + + 233 + 356 + + + + + Threaded + toggled(bool) + ThreadDepthType + setEnabled(bool) + + + 49 + 247 + + + 142 + 286 + + + + + Threaded + toggled(bool) + ThreadDepth + setEnabled(bool) + + + 58 + 249 + + + 273 + 289 + + + + + Threaded + toggled(bool) + ModelThread + setEnabled(bool) + + + 27 + 252 + + + 43 + 357 + + + + + drillPointAngled + toggled(bool) + DrillForDepth + setVisible(bool) + + + 112 + 686 + + + 113 + 718 - +