From 6ea6b48c0eee864d60bc89e92b47f733055514c7 Mon Sep 17 00:00:00 2001
From: David Osterberg <davost@gmail.com>
Date: Sun, 14 Feb 2021 15:32:04 +0100
Subject: [PATCH] PartDesign: [Hole] Add Entire Depth thread depth mode

---
 src/Mod/PartDesign/App/FeatureHole.cpp       | 21 +++++++++++++-------
 src/Mod/PartDesign/Gui/TaskHoleParameters.ui |  5 +++++
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/Mod/PartDesign/App/FeatureHole.cpp b/src/Mod/PartDesign/App/FeatureHole.cpp
index d479bc32ec..b9fd0df5b5 100644
--- a/src/Mod/PartDesign/App/FeatureHole.cpp
+++ b/src/Mod/PartDesign/App/FeatureHole.cpp
@@ -76,7 +76,7 @@ namespace PartDesign {
 /* TRANSLATOR PartDesign::Hole */
 
 const char* Hole::DepthTypeEnums[]                   = { "Dimension", "ThroughAll", /*, "UpToFirst", */ NULL };
-const char* Hole::ThreadDepthTypeEnums[]             = { "Automatic", "Dimension", NULL };
+const char* Hole::ThreadDepthTypeEnums[]             = { "Automatic", "Dimension", "Hole Depth", NULL };
 const char* Hole::ThreadTypeEnums[]                  = { "None", "ISOMetricProfile", "ISOMetricFineProfile", "UNC", "UNF", "UNEF", NULL};
 const char* Hole::ClearanceMetricEnums[]             = { "Standard", "Close", "Wide", NULL};
 const char* Hole::ClearanceUTSEnums[]                = { "Normal", "Close", "Loose", NULL };
@@ -1002,9 +1002,12 @@ void Hole::updateThreadDepthParam()
 
     if ( std::string(ThreadDepthType.getValueAsString()) == "Automatic" ) {
         ThreadDepth.setValue(Depth.getValue() - getThreadRunout());
-        if ( method == "ThroughAll" ) {
-            ThreadDepth.setValue(drillDepth);
-        }
+    } else { // hole depth
+        ThreadDepth.setValue(Depth.getValue());
+    }
+
+    if ( method == "ThroughAll" ) {
+        ThreadDepth.setValue(drillDepth);
     }
 }
 
@@ -1438,7 +1441,7 @@ void Hole::onChanged(const App::Property *prop)
         updateThreadDepthParam();
     }
     else if (prop == &Depth) {
-        if (std::string(ThreadDepthType.getValueAsString()) == "Automatic") {
+        if (std::string(ThreadDepthType.getValueAsString()) != "Dimension") {
             updateDiameterParam();  // make sure diameter and pitch are updated.
             updateThreadDepthParam();
         }
@@ -1863,16 +1866,20 @@ App::DocumentObjectExecReturn *Hole::execute(void)
             double threadDepth = ThreadDepth.getValue();
             double helixLength = threadDepth + P/2;
             std::string threadDepthMethod(ThreadDepthType.getValueAsString());
-            if ( threadDepthMethod == "Automatic" ) {
+            if ( threadDepthMethod != "Dimension" ) {
                 std::string depthMethod(DepthType.getValueAsString());
                 if ( depthMethod == "ThroughAll" ) {
                     threadDepth = length;
                     ThreadDepth.setValue(threadDepth);
                     helixLength = threadDepth + 2*P;
-                } else {
+                } else if ( threadDepthMethod == "Automatic" ) {
                     threadDepth = Depth.getValue() - getThreadRunout();
                     ThreadDepth.setValue(threadDepth);
                     helixLength = threadDepth + P/2;
+                } else { // Hole depth
+                    threadDepth = Depth.getValue();
+                    ThreadDepth.setValue(threadDepth);
+                    helixLength = threadDepth + P/8;
                 }
             }
             TopoDS_Shape helix = TopoShape().makeLongHelix(P, helixLength, D / 2, 0.0, leftHanded);
diff --git a/src/Mod/PartDesign/Gui/TaskHoleParameters.ui b/src/Mod/PartDesign/Gui/TaskHoleParameters.ui
index 2a0d6c9e98..b74ff5db82 100644
--- a/src/Mod/PartDesign/Gui/TaskHoleParameters.ui
+++ b/src/Mod/PartDesign/Gui/TaskHoleParameters.ui
@@ -443,6 +443,11 @@ Only available for holes without thread</string>
        <string>Dimension</string>
       </property>
      </item>
+     <item>
+      <property name="text">
+       <string>Hole depth</string>
+      </property>
+     </item>
     </widget>
    </item>
    <item row="11" column="2" colspan="3">