[PartDesign] Dynamic hole cut-types #3999
Conversation
fix a problem with counterbore and countersink in PartDesign Hole feature. It was not possible to custom define counterbores or countersinks if a metric thread hole was selected. Handle the cut-types None, Counterbore and Countersink euqal regardless of type of thread and let the user customize: None: none Counterbore: diameter and depth Countersink: diameter and angle
‣ Make countersink and counterbore on metric holes freely definable by user. ‣ Fixed the Naming of M1.6, M2, M2.5 and M3.5 ‣ Added constructor for custom enums from Enums to PropertyEnumeration ‣ Put definitions of cut-types (counterbore/countersink) for screwtypes into json-files for easy modification. ‣ Allow users to put its own definitions in json-files in [UserDir]/Mod/PartDesign/Resources/Hole ‣ Contains several examples of cut-type definition json-files that are propably not production-ready. This uses a local copy of nlohmann::json¹ to read json-files. __________ ¹ This is a very nice,header-only C++ library under the MIT License (https://github.com/nlohmann/json). I copied the single-file-version and the forward-declaration-header into …/PartDesign/App/ so no new dependencies arise.
berberic2
force-pushed
the
feature/hole-counter-dynamic
branch
from
112cc5c
to
8099246
Compare
|
|
||
| fc_target_copy_resource(PartDesignHole | ||
| ${CMAKE_CURRENT_SOURCE_DIR} | ||
| ${CMAKE_BINARY_DIR}/share/Mod/PartDesign |
There was a problem hiding this comment.
share shouldn't be hard-coded. Use ${CMAKE_INSTALL_DATADIR} instead
| FILES | ||
| ${PartDesignHoleDefines} | ||
| DESTINATION | ||
| share/Mod/PartDesign/Resources/Hole |
There was a problem hiding this comment.
share shouldn't be hard-coded. Use ${CMAKE_INSTALL_DATADIR} instead.
In order to find the location at runtime use App::Application::getResourceDir().
| /*! | ||
| @brief namespace for Niels Lohmann | ||
| @see https://github.com/nlohmann | ||
| @since version 1.0.0 |
There was a problem hiding this comment.
In the forum you said this file is under MIT but this header file lacks of this information. So, it's best to directly add the license here, too.
According to the doxygen documentation a tag \license doesn't exist but apparently \copyright is used for this purpose.
So, \copyright MIT should be OK.
There was a problem hiding this comment.
I contacted upstream with this result:
The MIT license not really requires adding the license to all files, but I may work on this in the future.
| @@ -1359,3 +1300,149 @@ App::DocumentObjectExecReturn *Hole::execute(void) | |||
| return new App::DocumentObjectExecReturn(e.what()); | |||
| } | |||
| } | |||
|
|
|||
| void Hole::addCounterType(const CutDimensionSet dimensions) | |||
There was a problem hiding this comment.
Shouldn't this be a const reference?
This uses a local copy of nlohmann::json¹ to read json-files.
Includes pullrequest #3990
Forum-Threads:
¹ This is a very nice,header-only C++ library under the MIT License (https://github.com/nlohmann/json). I copied the single-file-version and the forward-declaration-header into …/PartDesign/App/ so no new dependencies arise.
Thank you for creating a pull request to contribute to FreeCAD! To ease integration, please confirm the following:
git pull --rebase upstream master./bin/FreeCAD --run-test 0issue #<id>orfixes #<id>where<id>is the associated MantisBT issue id if one existsAnd please remember to update the Wiki with the features added or changed once this PR is merged.
Note: If you don't have wiki access, then please mention your contribution on the 0.19 Changelog Forum Thread.