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

[PD] more hole cut work

Browse Source 
- add definitions for IS 2009, 7046 and 12474
- remove useless file for a ISO 14583 since there are no such screws on the market
- rename "coarse" to "regular" since this what it actually is according to the norms
- uniform the x1 threads (for x2.0 etc we use a trailing zero and for some we use x1, for some already x1.0, thus consistently use x1.0)
- add some ISO 10642 entries
- correct ISO 4762:
  - correct some values
  - the does does not define a size M27
  - add the two missing sizes
This commit is contained in:
donovaly
2020-11-11 03:21:42 +01:00
committed by wwmayer
parent 04be99a2aa
commit 68673c6ad1
11 changed files with 92 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -93,7 +93,7 @@ const Hole::ThreadDescription Hole::threadDescription[][171] =
{ "---", 6.0, 0.0 },
},
/* ISO metric coarse */
/* ISO metric regular */
{
{ "M1.6", 1.60, 0.35 },
{ "M2", 2.00, 0.40 },
@@ -142,21 +142,21 @@ const Hole::ThreadDescription Hole::threadDescription[][171] =
{ "M8x0.75", 8.0, 0.75 },
{ "M8x1.0", 8.0, 1.00 },
{ "M9x0.75", 9.0, 0.75 },
{ "M9x1", 9.0, 1.00 },
{ "M9x1.0", 9.0, 1.00 },
{ "M10x0.75", 10.0, 0.75 },
{ "M10x1", 10.0, 1.00 },
{ "M10x1.0", 10.0, 1.00 },
{ "M10x1.25", 10.0, 1.25 },
{ "M11x0.75", 11.0, 0.75 },
{ "M11x1", 11.0, 1.00 },
{ "M12x1", 12.0, 1.00 },
{ "M11x1.0", 11.0, 1.00 },
{ "M12x1.0", 12.0, 1.00 },
{ "M12x1.25", 12.0, 1.25 },
{ "M12x1.5", 12.0, 1.50 },
{ "M14x1.0", 14.0, 1.00 },
{ "M14x1.25", 14.0, 1.25 },
{ "M14x1.5", 14.0, 1.50 },
{ "M15x1", 15.0, 1.00 },
{ "M15x1.0", 15.0, 1.00 },
{ "M15x1.5", 15.0, 1.50 },
{ "M16x1", 16.0, 1.00 },
{ "M16x1.0", 16.0, 1.00 },
{ "M16x1.5", 16.0, 1.50 },
{ "M17x1.0", 17.0, 1.00 },
{ "M17x1.5", 17.0, 1.50 },
@@ -373,10 +373,10 @@ const char* Hole::ThreadSize_ISOmetricfine_Enums[] = {
"M2.5x0.35", "M3x0.35", "M3.5x0.35",
"M4x0.5", "M4.5x0.5", "M5x0.5", "M5.5x0.5",
"M6x0.75", "M7x0.75", "M8x0.75", "M8x1.0",
"M9x0.75", "M9x 1", "M10x0.75", "M10x1",
"M10x1.25", "M11x0.75", "M11x1", "M12x1",
"M9x0.75", "M9x1.0", "M10x0.75", "M10x1.0",
"M10x1.25", "M11x0.75", "M11x1.0", "M12x1.0",
"M12x1.25", "M12x1.5", "M14x1.0", "M14x1.25",
"M14x1.5", "M15x1", "M15x1.5", "M16x1",
"M14x1.5", "M15x1.0", "M15x1.5", "M16x1.0",
"M16x1.5", "M17x1.0", "M17x1.5", "M18x1.0",
"M18x1.5", "M18x2.0", "M20x1.0", "M20x1.5",
"M20x2.0", "M22x1.0", "M22x1.5", "M22x2.0",

4
src/Mod/PartDesign/CMakeLists.txt
View File

@@ -137,12 +137,14 @@ set(PartDesignHoleDefines
Resources/Hole/din7984.json
Resources/Hole/iso10642.json
Resources/Hole/iso10642-fine.json
Resources/Hole/iso12474-fine.json
Resources/Hole/iso14583.json
Resources/Hole/iso14583-fine.json
Resources/Hole/iso14583part.json
Resources/Hole/iso2009.json
Resources/Hole/iso4762_7089.json
Resources/Hole/iso4762.json
Resources/Hole/iso4762-fine.json
Resources/Hole/iso7046.json
)
add_custom_target(PartDesignHole ALL SOURCES

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

@@ -70,9 +70,9 @@ TaskHoleParameters::TaskHoleParameters(ViewProviderHole *HoleView, QWidget *pare
ui->label_Angle->setVisible(false);
ui->ThreadType->addItem(tr("None"), QByteArray("None"));
ui->ThreadType->addItem(tr("ISO metric coarse profile"), QByteArray("ISO"));
ui->ThreadType->addItem(tr("ISO metric regular profile"), QByteArray("ISO"));
ui->ThreadType->addItem(tr("ISO metric fine profile"), QByteArray("ISO"));
ui->ThreadType->addItem(tr("UTS coarse profile"), QByteArray("UTS"));
ui->ThreadType->addItem(tr("UTS regular profile"), QByteArray("UTS"));
ui->ThreadType->addItem(tr("UTS fine profile"), QByteArray("UTS"));
ui->ThreadType->addItem(tr("UTS extra fine profile"), QByteArray("UTS"));

5
src/Mod/PartDesign/Resources/Hole/iso10642-fine.json
View File

@@ -4,13 +4,16 @@
"thread_type": "metricfine",
"angle": 90,
"data": [
{ "thread": "M1.6x0.2", "diameter": 3.6 },
{ "thread": "M2x0.25", "diameter": 4.5 },
{ "thread": "M2.5x0.35", "diameter": 5.6 },
{ "thread": "M3x0.35", "diameter": 6.7 },
{ "thread": "M4x0.5", "diameter": 9.0 },
{ "thread": "M5x0.5", "diameter": 12.2 },
{ "thread": "M6x0.75", "diameter": 13.5 },
{ "thread": "M8x0.75", "diameter": 18.0 },
{ "thread": "M8x1.0", "diameter": 18.0 },
{ "thread": "M10x1", "diameter": 22.4 },
{ "thread": "M10x1.0", "diameter": 22.4 },
{ "thread": "M10x1.25", "diameter": 22.4 },
{ "thread": "M12x1.25", "diameter": 26.8 },
{ "thread": "M12x1.5", "diameter": 26.8 },

3
src/Mod/PartDesign/Resources/Hole/iso10642.json
View File

@@ -4,6 +4,9 @@
"thread_type": "metric",
"angle": 90,
"data": [
{ "thread": "M1.6", "diameter": 3.6 },
{ "thread": "M2", "diameter": 4.5 },
{ "thread": "M2.5", "diameter": 5.6 },
{ "thread": "M3", "diameter": 6.7 },
{ "thread": "M4", "diameter": 9.0 },
{ "thread": "M5", "diameter": 12.2 },

23
src/Mod/PartDesign/Resources/Hole/iso12474-fine.json Normal file
View File

@@ -0,0 +1,23 @@
{
"name": "ISO 12474",
"cut_type": "counterbore",
"thread_type": "metricfine",
"data": [
{ "thread": "M8x1.0", "diameter": 15.0, "depth": 8.6 },
{ "thread": "M10x1.0", "diameter": 18.0, "depth": 10.6 },
{ "thread": "M10x1.25", "diameter": 18.0, "depth": 10.6 },
{ "thread": "M12x1.25", "diameter": 20.0, "depth": 12.6 },
{ "thread": "M12x1.5", "diameter": 20.0, "depth": 12.6 },
{ "thread": "M14x1.5", "diameter": 24.0, "depth": 14.6 },
{ "thread": "M16x1.5", "diameter": 26.0, "depth": 16.6 },
{ "thread": "M18x1.5", "diameter": 30.0, "depth": 18.6 },
{ "thread": "M20x1.5", "diameter": 33.0, "depth": 20.6 },
{ "thread": "M20x2.0", "diameter": 33.0, "depth": 20.6 },
{ "thread": "M22x1.5", "diameter": 36.0, "depth": 22.8 },
{ "thread": "M24x2.0", "diameter": 40.0, "depth": 24.8 },
{ "thread": "M30x2.0", "diameter": 50.0, "depth": 31.0 },
{ "thread": "M33x1.5", "diameter": 54.0, "depth": 34.0 },
{ "thread": "M36x3.0", "diameter": 58.0, "depth": 37.0 },
{ "thread": "M42x3.0", "diameter": 69.0, "depth": 41.0 }
]
}

18
src/Mod/PartDesign/Resources/Hole/iso14583-fine.json
View File

@@ -1,18 +0,0 @@
{
"name": "ISO 14583",
"cut_type": "counterbore",
"thread_type": "metricfine",
"data": [
{ "thread": "M2x0.25", "diameter": 4.4, "depth": 2.0 },
{ "thread": "M2.5x0.35", "diameter": 5.4, "depth": 2.5 },
{ "thread": "M3x0.35", "diameter": 6.0, "depth": 2.8 },
{ "thread": "M3.5x0.35", "diameter": 7.6, "depth": 3.0 },
{ "thread": "M4x0.5", "diameter": 8.6, "depth": 3.5 },
{ "thread": "M5x0.5", "diameter": 10.1, "depth": 4.1 },
{ "thread": "M6x0.75", "diameter": 12.6, "depth": 5.0 },
{ "thread": "M8x0.75", "diameter": 16.6, "depth": 6.6 },
{ "thread": "M8x1.0", "diameter": 16.6, "depth": 6.6 },
{ "thread": "M10x1", "diameter": 20.8, "depth": 8.1 },
{ "thread": "M10x1.25", "diameter": 20.8, "depth": 8.1 }
]
}

17
src/Mod/PartDesign/Resources/Hole/iso2009.json Normal file
View File

@@ -0,0 +1,17 @@
{
"name": "ISO 2009",
"cut_type": "countersink",
"thread_type": "metric",
"angle": 90,
"data": [
{ "thread": "M2", "diameter": 4.3 },
{ "thread": "M2.5", "diameter": 5.3 },
{ "thread": "M3", "diameter": 6.3 },
{ "thread": "M4", "diameter": 9.5 },
{ "thread": "M5", "diameter": 10.5 },
{ "thread": "M6", "diameter": 12.7 },
{ "thread": "M8", "diameter": 17.7 },
{ "thread": "M10", "diameter": 20.2 },
{ "thread": "M12", "diameter": 24.7 }
]
}

13
src/Mod/PartDesign/Resources/Hole/iso4762-fine.json
View File

@@ -4,16 +4,16 @@
"thread_type": "metricfine",
"data": [
{ "thread": "M1.6x0.2", "diameter": 3.5, "depth": 1.7 },
{ "thread": "M2x0.25", "diameter": 4.4, "depth": 2.1 },
{ "thread": "M2.5x0.35", "diameter": 5.5, "depth": 3.0 },
{ "thread": "M3x0.35", "diameter": 6.5, "depth": 3.4 },
{ "thread": "M2x0.25", "diameter": 4.3, "depth": 2.1 },
{ "thread": "M2.5x0.35", "diameter": 5.0, "depth": 3.0 },
{ "thread": "M3x0.35", "diameter": 6.0, "depth": 3.4 },
{ "thread": "M3.5x0.35", "diameter": 6.5, "depth": 3.9 },
{ "thread": "M4x0.5", "diameter": 8.0, "depth": 4.4 },
{ "thread": "M5x0.5", "diameter": 10.0, "depth": 5.4 },
{ "thread": "M6x0.75", "diameter": 11.0, "depth": 6.4 },
{ "thread": "M8x0.75", "diameter": 15.0, "depth": 8.6 },
{ "thread": "M8x1.0", "diameter": 15.0, "depth": 8.6 },
{ "thread": "M10x1", "diameter": 18.0, "depth": 10.6 },
{ "thread": "M10x1.0", "diameter": 18.0, "depth": 10.6 },
{ "thread": "M10x1.25", "diameter": 18.0, "depth": 10.6 },
{ "thread": "M12x1.25", "diameter": 20.0, "depth": 12.6 },
{ "thread": "M12x1.5", "diameter": 20.0, "depth": 12.6 },
@@ -26,9 +26,8 @@
{ "thread": "M22x1.5", "diameter": 36.0, "depth": 22.8 },
{ "thread": "M22x2.0", "diameter": 36.0, "depth": 22.8 },
{ "thread": "M24x2.0", "diameter": 40.0, "depth": 24.8 },
{ "thread": "M27x2.0", "diameter": 46.0, "depth": 31.0 },
{ "thread": "M30x2.0", "diameter": 50.0, "depth": 34.0 },
{ "thread": "M33x2.0", "diameter": 54.0, "depth": 36.0 },
{ "thread": "M30x2.0", "diameter": 50.0, "depth": 31.0 },
{ "thread": "M33x2.0", "diameter": 54.0, "depth": 34.0 },
{ "thread": "M36x3.0", "diameter": 58.0, "depth": 37.0 },
{ "thread": "M42x3.0", "diameter": 69.0, "depth": 43.0 },
{ "thread": "M48x3.0", "diameter": 78.0, "depth": 49.0 }

15
src/Mod/PartDesign/Resources/Hole/iso4762.json
View File

@@ -4,9 +4,9 @@
"thread_type": "metric",
"data": [
{ "thread": "M1.6", "diameter": 3.5, "depth": 1.7 },
{ "thread": "M2", "diameter": 4.4, "depth": 2.1 },
{ "thread": "M2.5", "diameter": 5.5, "depth": 3.0 },
{ "thread": "M3", "diameter": 6.5, "depth": 3.4 },
{ "thread": "M2", "diameter": 4.3, "depth": 2.1 },
{ "thread": "M2.5", "diameter": 5.0, "depth": 3.0 },
{ "thread": "M3", "diameter": 6.0, "depth": 3.4 },
{ "thread": "M3.5", "diameter": 6.5, "depth": 3.9 },
{ "thread": "M4", "diameter": 8.0, "depth": 4.4 },
{ "thread": "M5", "diameter": 10.0, "depth": 5.4 },
@@ -20,11 +20,12 @@
{ "thread": "M20", "diameter": 33.0, "depth": 20.6 },
{ "thread": "M22", "diameter": 36.0, "depth": 22.8 },
{ "thread": "M24", "diameter": 40.0, "depth": 24.8 },
{ "thread": "M27", "diameter": 46.0, "depth": 31.0 },
{ "thread": "M30", "diameter": 50.0, "depth": 34.0 },
{ "thread": "M33", "diameter": 54.0, "depth": 36.0 },
{ "thread": "M30", "diameter": 50.0, "depth": 31.0 },
{ "thread": "M33", "diameter": 54.0, "depth": 34.0 },
{ "thread": "M36", "diameter": 58.0, "depth": 37.0 },
{ "thread": "M42", "diameter": 69.0, "depth": 43.0 },
{ "thread": "M48", "diameter": 78.0, "depth": 49.0 }
{ "thread": "M48", "diameter": 78.0, "depth": 49.0 },
{ "thread": "M54", "diameter": 90.0, "depth": 55.0 },
{ "thread": "M64", "diameter": 103.0, "depth": 65.0 }
]
}

16
src/Mod/PartDesign/Resources/Hole/iso7046.json Normal file
View File

@@ -0,0 +1,16 @@
{
"name": "ISO 7046",
"cut_type": "countersink",
"thread_type": "metric",
"angle": 90,
"data": [
{ "thread": "M2", "diameter": 4.3 },
{ "thread": "M2.5", "diameter": 5.3 },
{ "thread": "M3", "diameter": 6.3 },
{ "thread": "M4", "diameter": 9.5 },
{ "thread": "M5", "diameter": 10.5 },
{ "thread": "M6", "diameter": 12.7 },
{ "thread": "M8", "diameter": 17.7 },
{ "thread": "M10", "diameter": 20.5 }
]
}