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.

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

Sync with MoveIt1 #2504

Draft
wants to merge 16 commits into
base: main
Choose a base branch
from
Draft

Sync with MoveIt1 #2504

wants to merge 16 commits into from

Conversation

Abishalini
Copy link
Contributor

@Abishalini Abishalini commented Oct 31, 2023

This is a continued effort from #2212. I am breaking down the original author's PR into multiple PR so it is easy to review.

Syncing the following commits

* [2022-09-09] [63660ef21] | Merge PR #3093: extended ACM editing in MSA {{Robert Haschke}} 
* [2022-08-30] [fd5b81c0e] | LinearModel: auto-stretch columns {{Robert Haschke}} 
* [2022-08-30] [90ba5d682] | Improve CollisionLinearModel::setData() {{Robert Haschke}} 
* [2022-08-30] [6b5f450f2] | Linear View: Consider state of "show enabled pairs" checkbox {{Robert Haschke}} 
* [2022-08-30] [0bee1abe4] | Simplify code {{Robert Haschke}} 
* [2022-08-30] [28bd73cca] | Allow disabling/enabling links by default {{Robert Haschke}} 
* [2022-08-29] [5c1531479] | Use matrix view by default {{Robert Haschke}} 
* [2022-08-29] [77c3d3692] | Reenable ACM editing {{Robert Haschke}} 
* [2022-03-15] [27c1d918c] | Display ACM considering default-disabled links {{Robert Haschke}} 
* [2022-03-15] [46e435244] | Drop unused Collision*Model::reason() {{Robert Haschke}} 
* [2022-08-30] [2f97f6e0d] | Fix stack use after scope {{Robert Haschke}} 

The commits are from PR - moveit/moveit#3093

TODO

  • Test you can generate the following tags in SRDF using MSA
<disable_default_collisions link="link_name" />
<enable_collisions link1="link1_name" link2="link2_name" reason="optional-reason" />
<disable_collisions link1="link1_name" link2="link2_name" reason="optional-reason" />

rhaschke and others added 12 commits August 30, 2022 21:10
... as revealed by asan. Seems to be a bug in libyamlcpp.
- Directly use SRDFWriter as data source for data models
- LinkPairMap only used temporarily in generateCollisionTable()
- Use wip_srdf_ as work-in-progress copy of config_data_->srdf_
  to allow reverting
Move common code into method selectedSections()
When switching from matrix to linear view, the checkbox state was ignored.
- Run costly mapToSource() only if actually needed
- Signal dataChanged() on success only
@codecov
Copy link

codecov bot commented Oct 31, 2023

Codecov Report

Attention: 149 lines in your changes are missing coverage. Please review.

Comparison is base (73f4551) 50.40% compared to head (a03375a) 50.71%.
Report is 55 commits behind head on main.

Files Patch % Lines
...veit_setup_srdf_plugins/src/default_collisions.cpp 0.00% 65 Missing ⚠️
...tup_srdf_plugins/src/default_collisions_widget.cpp 0.00% 42 Missing ⚠️
..._setup_srdf_plugins/src/collision_matrix_model.cpp 0.00% 25 Missing ⚠️
...e/moveit_setup_srdf_plugins/default_collisions.hpp 0.00% 10 Missing ⚠️
..._setup_srdf_plugins/src/collision_linear_model.cpp 0.00% 6 Missing ⚠️
...oveit_setup_srdf_plugins/src/group_meta_config.cpp 0.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2504      +/-   ##
==========================================
+ Coverage   50.40%   50.71%   +0.31%     
==========================================
  Files         391      391              
  Lines       31982    32210     +228     
==========================================
+ Hits        16117    16331     +214     
- Misses      15865    15879      +14     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@henningkayser henningkayser self-requested a review November 14, 2023 15:42
Copy link

github-actions bot commented Jan 1, 2024

This PR is stale because it has been open for 45 days with no activity. Please tag a maintainer for help on completing this PR, or close it if you think it has become obsolete.

@github-actions github-actions bot added the stale Inactive issues and PRs are marked as stale and may be closed automatically. label Jan 1, 2024
@github-actions github-actions bot removed the stale Inactive issues and PRs are marked as stale and may be closed automatically. label Nov 21, 2024
Copy link

mergify bot commented Nov 21, 2024

This pull request is in conflict. Could you fix it @Abishalini?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants