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

PartDesign: Hole: Rename Automatic Tapped (DIN76) and change default to Hole depth.

Browse Source
This commit is contained in:
David Osterberg
2021-02-16 07:55:20 +01:00
committed by wwmayer
parent d7ae53d597
commit 41724cd29b
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,7 +76,7 @@ namespace PartDesign {
/* TRANSLATOR PartDesign::Hole */
const char* Hole::DepthTypeEnums[] = { "Dimension", "ThroughAll", /*, "UpToFirst", */ NULL };
const char* Hole::ThreadDepthTypeEnums[] = { "Automatic", "Dimension", "Hole Depth", NULL };
const char* Hole::ThreadDepthTypeEnums[] = { "Hole Depth", "Dimension", "Tapped (DIN76)", 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 };
@@ -1000,7 +1000,7 @@ void Hole::updateThreadDepthParam()
throw Base::RuntimeError("Unsupported depth type \n");
}
if ( std::string(ThreadDepthType.getValueAsString()) == "Automatic" ) {
if ( std::string(ThreadDepthType.getValueAsString()) == "Tapped (DIN76)" ) {
ThreadDepth.setValue(Depth.getValue() - getThreadRunout());
} else { // hole depth
ThreadDepth.setValue(Depth.getValue());
@@ -1872,7 +1872,7 @@ App::DocumentObjectExecReturn *Hole::execute(void)
threadDepth = length;
ThreadDepth.setValue(threadDepth);
helixLength = threadDepth + 2*P;
} else if ( threadDepthMethod == "Automatic" ) {
} else if ( threadDepthMethod == "Tapped (DIN76)" ) {
threadDepth = Depth.getValue() - getThreadRunout();
ThreadDepth.setValue(threadDepth);
helixLength = threadDepth + P/2;

4
src/Mod/PartDesign/Gui/TaskHoleParameters.ui
View File

@@ -435,7 +435,7 @@ Only available for holes without thread</string>
</property>
<item>
<property name="text">
<string>Automatic</string>
<string>Hole depth</string>
</property>
</item>
<item>
@@ -445,7 +445,7 @@ Only available for holes without thread</string>
</item>
<item>
<property name="text">
<string>Hole depth</string>
<string>Tapped (DIN76)</string>
</property>
</item>
</widget>