Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Path: Adaptive work #4161

Merged
merged 4 commits into from Dec 26, 2020
Merged

Path: Adaptive work #4161

merged 4 commits into from Dec 26, 2020

Conversation

bryanbendall
Copy link
Contributor

Thank you for creating a pull request to contribute to FreeCAD! To ease integration, please confirm the following:

  • Branch rebased on latest master git pull --rebase upstream master
  • Unit tests confirmed to pass by running ./bin/FreeCAD --run-test 0
  • Commit message is well-written
  • Commit message includes issue #<id> or fixes #<id> where <id> is the associated MantisBT issue id if one exists

And 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.

@bryanbendall
Copy link
Contributor Author

Discussion:
https://forum.freecadweb.org/viewtopic.php?f=15&t=53371

@Russ4262
Copy link
Contributor

Welcome to the project!
Please tag the PR titles with a leading workbench marker such as "[PATH], [Path], Path:, or PATH:" so reviewers can easily identify which PRs to review based on their involvement with the project. This also helps passersby to know to which workbench a PR pertains.

Thanks,
Russell

@Schildkroet
Copy link
Contributor

I already mentioned in the forum, that we have a "leave stock" option.

@bryanbendall bryanbendall changed the title Adaptive work PahAdaptive work Dec 18, 2020
@bryanbendall bryanbendall changed the title PahAdaptive work Path: Adaptive work Dec 18, 2020
@bryanbendall
Copy link
Contributor Author

I changed the title Russell, sorry I thought I had done that. Still getting used to this.

Schildkroet, I know that we have that but that is not the point of this. Please see the rest of the post.

@Schildkroet
Copy link
Contributor

Ive seen this before so that you can finish it with a different and sharper tool.

Thats exactly what "leave stock" does. It leaves some stock to finish it with a differnt tool/OP

@bryanbendall
Copy link
Contributor Author

Schildkroet, I added to the post, please look at it. I hope you can see the difference.

@Russ4262
Copy link
Contributor

@bryanbendall May I suggest a rebase on current master so that Travis can verify build without errors. MLampert submitted a PR to fix Travis failure in Path tests and Sliptonic merged it yesterday.

@bryanbendall
Copy link
Contributor Author

@Russ4262 did I get that correct? I still have some trouble working with git

@Russ4262
Copy link
Contributor

Afternoon sir.
Just FYI, I am very ignorant when it comes to Git. I am using GitKraken as my source manager. I do know, from many past attempts, that there are multiple ways to bring a branch current. From my end, it looks like you merged the upstream/master into your branch, rather than rebasing on upstream/master. But I could be incorrectly interpreting what I am seeing. lol. Nonetheless, what you did should yield the same result as far as the code is concerned.

I had a whole lot of help from senior users Sliptonic and MLampert in the beginning. I am confident that user Vocx-fc can help as well. Early on I made a mess of the Git history and my usage was horrible. They helped me at least get to a level they can tolerate - God bless those guys.

@Russ4262
Copy link
Contributor

I just initiated a cloning of your repo. When finished, I will build and run a few tests to support your effort. If it merges beforehand, good deal.

@bryanbendall
Copy link
Contributor Author

Thats great Russ, if you have any questions let me know. Hope it all works.

@sliptonic sliptonic merged commit 72ec38b into FreeCAD:master Dec 26, 2020
@bryanbendall bryanbendall deleted the adaptive-work branch February 16, 2021 18:26
mosfet80 added a commit to mosfet80/FreeCAD that referenced this pull request Dec 21, 2023
@mosfet80
updated nlohmann/json
d796968 
updated to JSON version 3.11.3

Add missing <numeric> header include. FreeCAD#3717 FreeCAD#3718 FreeCAD#3719
Replace uses of INT_MIN/INT_MAX, etc. with

std::numeric_limits and consistently use std-namespaced integer types to make library work with newer GCC versions. FreeCAD#3722 FreeCAD#3723
Add missing files (json_fwd.hpp and Bazel build files) to release artifact include.zip. FreeCAD#3727 FreeCAD#3728
Fix 'declaration hides global declaration' warning. FreeCAD#3751
Fix natvis XML. FreeCAD#3858 FreeCAD#3863
Fix warning about moved from object. FreeCAD#3805 FreeCAD#3889
Remove a magic number to fix a warning. FreeCAD#3837 FreeCAD#3888
Fix debug pretty-printer by checking if match is valid before accessing group. FreeCAD#3919 FreeCAD#3920
Fix custom allocators by defining missing rebind type. FreeCAD#3895 FreeCAD#3927
Prevent memory leak when exception is thrown in adl_serializer::to_json FreeCAD#3881 FreeCAD#3901
Fix Clang-Tidy warnings. FreeCAD#4047
Fix init-list construction when size_type is not int. FreeCAD#4140
Fix deprecation warning "identifier _json preceded by whitespace in a literal operator declaration". FreeCAD#4129 FreeCAD#4161
Fix compile error with _HAS_STATIC_RTTI=0. FreeCAD#4046
Fix char_traits deprecation warning "char_traits<unsigned char> is deprecated: char_traits<T> for T not equal to char, wchar_t, char8_t, char16_t or char32_t is non-standard". FreeCAD#4163 FreeCAD#4179
@mosfet80 mosfet80 mentioned this pull request Dec 21, 2023
Merged
chennes pushed a commit that referenced this pull request Jan 15, 2024
@mosfet80 @chennes
updated nlohmann/json
dacdc2b 
updated to JSON version 3.11.3

Add missing <numeric> header include. #3717 #3718 #3719
Replace uses of INT_MIN/INT_MAX, etc. with

std::numeric_limits and consistently use std-namespaced integer types to make library work with newer GCC versions. #3722 #3723
Add missing files (json_fwd.hpp and Bazel build files) to release artifact include.zip. #3727 #3728
Fix 'declaration hides global declaration' warning. #3751
Fix natvis XML. #3858 #3863
Fix warning about moved from object. #3805 #3889
Remove a magic number to fix a warning. #3837 #3888
Fix debug pretty-printer by checking if match is valid before accessing group. #3919 #3920
Fix custom allocators by defining missing rebind type. #3895 #3927
Prevent memory leak when exception is thrown in adl_serializer::to_json #3881 #3901
Fix Clang-Tidy warnings. #4047
Fix init-list construction when size_type is not int. #4140
Fix deprecation warning "identifier _json preceded by whitespace in a literal operator declaration". #4129 #4161
Fix compile error with _HAS_STATIC_RTTI=0. #4046
Fix char_traits deprecation warning "char_traits<unsigned char> is deprecated: char_traits<T> for T not equal to char, wchar_t, char8_t, char16_t or char32_t is non-standard". #4163 #4179
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@bryanbendall @Russ4262 @Schildkroet @sundtek @sliptonic