From 62ab74d2dfcf7041441e38799f58e5fa7b51d6bd Mon Sep 17 00:00:00 2001 From: Alfredo Monclus Date: Fri, 3 Jan 2025 11:54:07 -0300 Subject: [PATCH] refactor(PD): change threadDescription into a vector --- src/Mod/PartDesign/App/FeatureHole.cpp | 6 ++---- src/Mod/PartDesign/App/FeatureHole.h | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Mod/PartDesign/App/FeatureHole.cpp b/src/Mod/PartDesign/App/FeatureHole.cpp index ff63ed393d..5a4b8cee3b 100644 --- a/src/Mod/PartDesign/App/FeatureHole.cpp +++ b/src/Mod/PartDesign/App/FeatureHole.cpp @@ -83,7 +83,7 @@ const char* Hole::ThreadClass_None_Enums[] = { "None", nullptr }; */ -const Hole::ThreadDescription Hole::threadDescription[][171] = +const std::vector Hole::threadDescription[] = { /* None */ { @@ -617,9 +617,7 @@ const Hole::UTSClearanceDefinition Hole::UTSHoleDiameters[22] = std::vector getThreadDesignations(const int threadType) { std::vector designations; for (const auto& thread : Hole::threadDescription[threadType]) { - if (thread.designation != nullptr) { - designations.emplace_back(thread.designation); - } + designations.push_back(thread.designation); } return designations; } diff --git a/src/Mod/PartDesign/App/FeatureHole.h b/src/Mod/PartDesign/App/FeatureHole.h index 11f75cb1a7..6b50107e03 100644 --- a/src/Mod/PartDesign/App/FeatureHole.h +++ b/src/Mod/PartDesign/App/FeatureHole.h @@ -92,7 +92,7 @@ public: double pitch; double TapDrill; }; - static const ThreadDescription threadDescription[][171]; + static const std::vector threadDescription[]; static const double metricHoleDiameters[51][4];