diff --git a/src/Mod/PartDesign/App/FeatureHole.cpp b/src/Mod/PartDesign/App/FeatureHole.cpp index 91230d9c7e..3d750e9439 100644 --- a/src/Mod/PartDesign/App/FeatureHole.cpp +++ b/src/Mod/PartDesign/App/FeatureHole.cpp @@ -125,7 +125,7 @@ const Hole::ThreadDescription Hole::threadDescription[][171] = { "M1.0x0.2", 1.0, 0.20 }, { "M1.1x0.2", 1.1, 0.20 }, { "M1.2x0.2", 1.2, 0.20 }, - { "M1.4z0.2", 1.4, 0.20 }, + { "M1.4x0.2", 1.4, 0.20 }, { "M1.6x0.2", 1.6, 0.20 }, { "M1.8x0.2", 1.8, 0.20 }, { "M2x0.25", 2.0, 0.25 }, @@ -368,7 +368,7 @@ const char* Hole::ThreadClass_ISOmetric_Enums[] = { "4G", "4H", "5G", "5H", "6G std::vector Hole::HoleCutType_ISOmetricfine_Enums = { "None", "Counterbore", "Countersink", "Cheesehead (deprecated)", "Countersink socket screw (deprecated)", "Cap screw (deprecated)" }; const char* Hole::ThreadSize_ISOmetricfine_Enums[] = { - "M1.0x0.2", "M1.1x0.2", "M1.2x0.2", "M1.4z0.2", + "M1.0x0.2", "M1.1x0.2", "M1.2x0.2", "M1.4x0.2", "M1.6x0.2", "M1.8x0.2", "M2x0.25", "M2.2x0.25", "M2.5x0.35", "M3x0.35", "M3.5x0.35", "M4x0.5", "M4.5x0.5", "M5x0.5", "M5.5x0.5", diff --git a/src/Mod/PartDesign/Gui/TaskHoleParameters.cpp b/src/Mod/PartDesign/Gui/TaskHoleParameters.cpp index 1ff7df1452..307e2784f2 100644 --- a/src/Mod/PartDesign/Gui/TaskHoleParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskHoleParameters.cpp @@ -378,7 +378,7 @@ void TaskHoleParameters::threadTypeChanged(int index) pcHole->ThreadType.setValue(index); // Size - // the size for ISO type has either foe form "M3x0.35" or just "M3" + // the size for ISO type has either the form "M3x0.35" or just "M3" // so we need to check if the size contains a 'x'. If yes, check if the string // up to the 'x' is exists in the new list if (TypeClass == QByteArray("ISO")) { @@ -386,18 +386,6 @@ void TaskHoleParameters::threadTypeChanged(int index) // we have an ISO fine size // cut of the part behind the 'x' ThreadSizeString = ThreadSizeString.left(ThreadSizeString.indexOf(QString::fromLatin1("x"))); - - // fractions end with a '0' in profile ISO coarse - // some translations might use the comma as decimal separator - if ((ThreadSizeString.indexOf(QString::fromLatin1(".")) > -1) - || (ThreadSizeString.indexOf(QString::fromLatin1(",")) > -1)) - ThreadSizeString.append(QString::fromLatin1("0")); - } - else { - // fractions don't end with a '0' in profile ISO fine - if ((ThreadSizeString.indexOf(QString::fromLatin1(".")) > -1) - || (ThreadSizeString.indexOf(QString::fromLatin1(",")) > -1)) - ThreadSizeString.remove(ThreadSizeString.size()-1, 1); } // search if the string exists in the combobox