From ab971fba19184867fa27aee9fb49b41c3b091236 Mon Sep 17 00:00:00 2001
From: Alfredo Monclus <alfredomonclus@gmail.com>
Date: Wed, 7 Aug 2024 22:37:41 -0300
Subject: [PATCH] feat(PD): set the proper angle for threads and countersinks

apply the recommended thread angle only if the user hasn't set an angle
---
 src/Mod/PartDesign/App/FeatureHole.cpp | 49 ++++++++++++++++++--------
 src/Mod/PartDesign/App/FeatureHole.h   |  2 ++
 2 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/src/Mod/PartDesign/App/FeatureHole.cpp b/src/Mod/PartDesign/App/FeatureHole.cpp
index 2ea7f705a2..06770a4baf 100644
--- a/src/Mod/PartDesign/App/FeatureHole.cpp
+++ b/src/Mod/PartDesign/App/FeatureHole.cpp
@@ -1084,8 +1084,7 @@ void Hole::updateHoleCutParams()
         }
 
     }
-    else { // we have an UTS profile or none
-
+    else {
         // we don't update for these settings but we need to set a value for new holes
         // furthermore we must assure the hole cut diameter is not <= the hole diameter
         // if we have a cut but the values are zero, we assume it is a new hole
@@ -1103,17 +1102,10 @@ void Hole::updateHoleCutParams()
         else if (holeCutTypeStr == "Countersink" || holeCutTypeStr == "Counterdrill") {
             if (HoleCutDiameter.getValue() == 0.0 || HoleCutDiameter.getValue() <= diameterVal) {
                 HoleCutDiameter.setValue(diameterVal * 1.7);
-                // 82 degrees for UTS, 90 otherwise
-                if (threadTypeStr != "None")
-                    HoleCutCountersinkAngle.setValue(82.0);
-                else
-                    HoleCutCountersinkAngle.setValue(90.0);
+                HoleCutCountersinkAngle.setValue(getCountersinkAngle());
             }
             if (HoleCutCountersinkAngle.getValue() == 0.0) {
-                if (threadTypeStr != "None")
-                    HoleCutCountersinkAngle.setValue(82.0);
-                else
-                    HoleCutCountersinkAngle.setValue(90.0);
+                HoleCutCountersinkAngle.setValue(getCountersinkAngle());
             }
             if (HoleCutDepth.getValue() == 0.0 && holeCutTypeStr == "Counterdrill") {
                 HoleCutDepth.setValue(1.0);
@@ -1125,6 +1117,23 @@ void Hole::updateHoleCutParams()
     }
 }
 
+double Hole::getCountersinkAngle() const
+{
+    std::string threadTypeStr = ThreadType.getValueAsString();
+    if (
+        threadTypeStr == "BSW"
+        || threadTypeStr == "BSF"
+    )
+        return 100.0;
+    if (
+        threadTypeStr == "UNC"
+        || threadTypeStr == "UNF"
+        || threadTypeStr == "UNEF"
+    )
+        return 82.0;
+    return 90.0;
+}
+
 double Hole::getThreadClassClearance() const
 {
     double pitch = getThreadPitch();
@@ -1425,6 +1434,12 @@ void Hole::updateDiameterParam()
         Diameter.setValue(opt.value());
 }
 
+double Hole::getThreadProfileAngle()
+{
+    // Both ISO 7-1 and ASME B1.20.1 define the same angle
+    return 90 - 1.79;
+}
+
 void Hole::onChanged(const App::Property* prop)
 {
     if (prop == &ThreadType) {
@@ -1657,6 +1672,8 @@ void Hole::onChanged(const App::Property* prop)
             CustomThreadClearance.setReadOnly(!UseCustomThreadClearance.getValue());
             ThreadDepthType.setReadOnly(false);
             ThreadDepth.setReadOnly(std::string(ThreadDepthType.getValueAsString()) != "Dimension");
+            if (Tapered.getValue() && TaperedAngle.getValue() == 90)
+                TaperedAngle.setValue(getThreadProfileAngle());
         }
         else {
             ThreadClass.setReadOnly(true);
@@ -1691,11 +1708,15 @@ void Hole::onChanged(const App::Property* prop)
         }
     }
     else if (prop == &Tapered) {
-        if (Tapered.getValue())
+        if (Tapered.getValue()) {
             TaperedAngle.setReadOnly(false);
-        else
+            if (Threaded.getValue() && TaperedAngle.getValue() == 90)
+                TaperedAngle.setValue(getThreadProfileAngle());
+        }
+        else {
+            TaperedAngle.setValue(90);
             TaperedAngle.setReadOnly(true);
-
+        }
     }
     else if (prop == &ThreadSize) {
         updateDiameterParam();
diff --git a/src/Mod/PartDesign/App/FeatureHole.h b/src/Mod/PartDesign/App/FeatureHole.h
index aaba922623..8164c9a7dc 100644
--- a/src/Mod/PartDesign/App/FeatureHole.h
+++ b/src/Mod/PartDesign/App/FeatureHole.h
@@ -236,9 +236,11 @@ private:
     void updateThreadDepthParam();
     void readCutDefinitions();
 
+    double getCountersinkAngle() const;
     double getThreadClassClearance() const;
     double getThreadRunout(int mode = 1) const;
     double getThreadPitch() const;
+    double getThreadProfileAngle();
     void rotateToNormal(const gp_Dir& helixAxis, const gp_Dir& normalAxis, TopoDS_Shape& helixShape) const;
     gp_Vec computePerpendicular(const gp_Vec&) const;
     TopoDS_Shape makeThread(const gp_Vec&, const gp_Vec&, double);