kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

feat(PD): BSF threads

Browse Source
This commit is contained in:
Alfredo Monclus
2024-08-13 14:52:06 -03:00
parent edb565046d
commit ce91285e4d
3 changed files with 67 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/Mod/PartDesign/App/FeatureHole.cpp
View File

@@ -67,7 +67,7 @@ namespace PartDesign {
const char* Hole::DepthTypeEnums[] = { "Dimension", "ThroughAll", /*, "UpToFirst", */ nullptr };
const char* Hole::ThreadDepthTypeEnums[] = { "Hole Depth", "Dimension", "Tapped (DIN76)", nullptr };
const char* Hole::ThreadTypeEnums[] = { "None", "ISOMetricProfile", "ISOMetricFineProfile", "UNC", "UNF", "UNEF", "NPT", "BSP", "BSW", nullptr};
const char* Hole::ThreadTypeEnums[] = { "None", "ISOMetricProfile", "ISOMetricFineProfile", "UNC", "UNF", "UNEF", "NPT", "BSP", "BSW", "BSF", nullptr};
const char* Hole::ClearanceMetricEnums[] = { "Standard", "Close", "Wide", nullptr};
const char* Hole::ClearanceUTSEnums[] = { "Normal", "Close", "Loose", nullptr };
const char* Hole::DrillPointEnums[] = { "Flat", "Angled", nullptr};
@@ -485,6 +485,41 @@ const Hole::ThreadDescription Hole::threadDescription[][171] =
{ "5", 127.005, 9.236, 0.0 },
{ "5 1/2", 139.705, 9.676, 0.0 },
{ "6", 152.406, 10.16, 0.0 },
},
/* BSF */
// BS 84 Basic sizes
// BS 1157 for drill sizes
{
{ "3/16", 4.763, 0.794, 4.00 },
{ "7/32", 5.558, 0.907, 4.60 },
{ "1/4", 6.350, 0.977, 5.30 },
{ "9/32", 7.142, 0.977, 6.10 },
{ "5/16", 7.938, 1.154, 6.80 },
{ "3/8", 9.525, 1.270, 8.30 },
{ "7/16", 11.113, 1.411, 9.70 },
{ "1/2", 12.700, 1.588, 11.10 },
{ "9/16", 14.288, 1.588, 12.70 },
{ "5/8", 15.875, 1.814, 14.00 },
{ "11/16", 17.463, 1.814, 15.50 },
{ "3/4", 19.050, 2.116, 16.75 },
{ "7/8", 22.225, 2.309, 19.75 },
{ "1", 25.400, 2.540, 22.75 },
{ "1 1/8", 28.575, 2.822, 25.50 },
{ "1 1/4", 31.750, 2.822, 28.50 },
{ "1 3/8", 34.925, 3.175, 31.50 },
{ "1 1/2", 38.100, 3.175, 34.50 },
{ "1 5/8", 41.275, 3.175, 0.0 },
{ "1 3/4", 44.450, 3.629, 0.0 },
{ "2", 50.800, 3.629, 0.0 },
{ "2 1/4", 57.150, 4.233, 0.0 },
{ "2 1/2", 63.500, 4.233, 0.0 },
{ "2 3/4", 69.850, 4.233, 0.0 },
{ "3", 76.200, 5.080, 0.0 },
{ "3 1/4", 82.550, 5.080, 0.0 },
{ "3 1/2", 88.900, 5.644, 0.0 },
{ "3 3/4", 95.250, 5.644, 0.0 },
{ "4", 101.600, 5.644, 0.0 },
{ "4 1/4", 107.950, 6.350, 0.0 },
}
};
@@ -765,6 +800,16 @@ const char* Hole::ThreadSize_BSW_Enums[] = { "1/8", "3/16", "1/4", "5/16", "3/
"4", "4 1/2", "5", "5 1/2", "6", nullptr };
const char* Hole::ThreadClass_BSW_Enums[] = { "Medium", "Normal", nullptr };
/* BSF */
const char* Hole::HoleCutType_BSF_Enums[] = { "None", "Counterbore", "Countersink", "Counterdrill", nullptr};
const char* Hole::ThreadSize_BSF_Enums[] = { "3/16", "7/32", "1/4", "9/32", "5/16", "3/8", "7/16",
"1/2", "9/16", "5/8", "11/16", "3/4", "7/8",
"1", "1 1/8", "1 1/4", "1 3/8", "1 1/2", "1 5/8", "1 3/4",
"2", "2 1/4", "2 1/2", "2 3/4",
"3", "3 1/4", "3 1/2", "3 3/4",
"4", "4 1/4", nullptr };
const char* Hole::ThreadClass_BSF_Enums[] = { "Medium", "Normal", nullptr };
const char* Hole::ThreadDirectionEnums[] = { "Right", "Left", nullptr};
PROPERTY_SOURCE(PartDesign::Hole, PartDesign::ProfileBased)
@@ -1227,6 +1272,7 @@ std::optional<double> Hole::determineDiameter() const
else if (
threadTypeStr == "BSP"
|| threadTypeStr == "BSW"
|| threadTypeStr == "BSF"
) {
double thread = 2 * (0.640327 * pitch);
// truncation is allowed by ISO-228 and BS 84
@@ -1538,6 +1584,20 @@ void Hole::onChanged(const App::Property* prop)
ThreadDepthType.setReadOnly(!Threaded.getValue());
ThreadDepth.setReadOnly(!Threaded.getValue());
}
else if (type == "BSF") {
ThreadSize.setEnums(ThreadSize_BSF_Enums);
ThreadClass.setEnums(ThreadClass_BSF_Enums);
HoleCutType.setEnums(HoleCutType_BSF_Enums);
Threaded.setReadOnly(false);
ThreadSize.setReadOnly(false);
ThreadFit.setReadOnly(Threaded.getValue());
Diameter.setReadOnly(true);
ModelThread.setReadOnly(!Threaded.getValue());
UseCustomThreadClearance.setReadOnly(!Threaded.getValue() || !ModelThread.getValue());
CustomThreadClearance.setReadOnly(!Threaded.getValue() || !ModelThread.getValue() || !UseCustomThreadClearance.getValue());
ThreadDepthType.setReadOnly(!Threaded.getValue());
ThreadDepth.setReadOnly(!Threaded.getValue());
}
if (holeCutTypeStr == "None") {
HoleCutCustomValues.setReadOnly(true);
@@ -2280,7 +2340,7 @@ TopoDS_Shape Hole::makeThread(const gp_Vec& xDir, const gp_Vec& zDir, double len
BRepBuilderAPI_MakeWire mkThreadWire;
double H;
std::string threadTypeStr = ThreadType.getValueAsString();
if (threadTypeStr == "BSP" || threadTypeStr == "BSW") {
if (threadTypeStr == "BSP" || threadTypeStr == "BSW" || threadTypeStr == "BSF") {
H = 0.960491 * Pitch; // Height of Sharp V
double radius = 0.137329 * Pitch; // radius of the crest
// construct the cross section going counter-clockwise

4
src/Mod/PartDesign/App/FeatureHole.h
View File

@@ -165,6 +165,10 @@ private:
static const char* ThreadSize_BSW_Enums[];
static const char* ThreadClass_BSW_Enums[];
/* BSF profile */
static const char* HoleCutType_BSF_Enums[];
static const char* ThreadSize_BSF_Enums[];
static const char* ThreadClass_BSF_Enums[];
static const double ThreadRunout[ThreadRunout_size][2];

1
src/Mod/PartDesign/Gui/TaskHoleParameters.cpp
View File

@@ -69,6 +69,7 @@ TaskHoleParameters::TaskHoleParameters(ViewProviderHole* HoleView, QWidget* pare
ui->ThreadType->addItem(tr("ANSI pipe profile"), QByteArray("NPT"));
ui->ThreadType->addItem(tr("BSP pipe profile"), QByteArray("BSP"));
ui->ThreadType->addItem(tr("BSW whitworth profile"), QByteArray("BSW"));
ui->ThreadType->addItem(tr("BSF whitworth fine profile"), QByteArray("BSF"));
// read values from the hole properties
auto pcHole = getObject<PartDesign::Hole>();