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

[MSA] Existing Package Loading Tweaks #1212

Merged
merged 1 commit into from
May 9, 2022

Conversation

DLu
Copy link
Contributor

@DLu DLu commented May 6, 2022

Description

The key change in this PR is basically one line:

extractPackageNameFromPath(config_pkg_path_, new_package_name_, relative_path);

which sets the package name for the MoveIt config to be the existing package name when loading from an existing MoveIt config. Easy enough....

...except new_package_name_ was also set in setPackagePath, called automatically from the ConfigurationFilesWidget. But that caused problems because the value of the package path was automatically derived from the existing package path, which means that the new_package_name_ would not reflect the actual package name, but instead reflect the name of the folder.

This is most notable with the moveit_resources where the folder is panda_moveit_config but the actual package name is moveit_resources_panda_moveit_config

Anyway, so this PR splits the functionality into two distinct paths, one for setting the package path, and one for setting the package name.

Checklist

  • Required by CI: Code is auto formatted using clang-format
  • Extend the tutorials / documentation reference
  • Document API changes relevant to the user in the MIGRATION.md notes
  • Create tests, which fail without this PR reference
  • Include a screenshot if changing a GUI
  • While waiting for someone to review your request, please help review another open pull request to support the maintainers

@mergify
Copy link

mergify bot commented May 6, 2022

Please target the main branch for development, we will backport the changes to feature/msa for you if approved and if they don't break API.

@codecov
Copy link

codecov bot commented May 6, 2022

Codecov Report

Merging #1212 (b8449f9) into feature/msa (9a8e005) will decrease coverage by 1.23%.
The diff coverage is n/a.

@@               Coverage Diff               @@
##           feature/msa    #1212      +/-   ##
===============================================
- Coverage        61.02%   59.80%   -1.22%     
===============================================
  Files              275      275              
  Lines            23761    23761              
===============================================
- Hits             14498    14207     -291     
- Misses            9263     9554     +291     
Impacted Files Coverage Δ
.../moveit_servo/include/moveit_servo/pose_tracking.h 0.00% <0.00%> (-100.00%) ⬇️
...servo/include/moveit_servo/make_shared_from_pool.h 0.00% <0.00%> (-100.00%) ⬇️
moveit_ros/moveit_servo/src/pose_tracking.cpp 0.00% <0.00%> (-77.00%) ⬇️
...eit/planning_scene_monitor/current_state_monitor.h 77.78% <0.00%> (-22.22%) ⬇️
...anning_scene_monitor/src/current_state_monitor.cpp 54.15% <0.00%> (-21.83%) ⬇️
moveit_ros/moveit_servo/src/servo.cpp 58.63% <0.00%> (-13.79%) ⬇️
moveit_ros/moveit_servo/src/collision_check.cpp 78.69% <0.00%> (-6.55%) ⬇️
...nning_scene_monitor/src/planning_scene_monitor.cpp 40.74% <0.00%> (-6.37%) ⬇️
...or/src/current_state_monitor_middleware_handle.cpp 82.36% <0.00%> (-5.88%) ⬇️
moveit_ros/moveit_servo/src/servo_calcs.cpp 65.67% <0.00%> (-2.47%) ⬇️
... and 5 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9a8e005...b8449f9. Read the comment docs.

Copy link
Contributor

@vatanaksoytezer vatanaksoytezer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this makes sense, I did something similar on my msa branch to test out things. Thanks a lot!

@vatanaksoytezer vatanaksoytezer merged commit ceee5c2 into moveit:feature/msa May 9, 2022
@DLu DLu deleted the package_settings_work branch May 9, 2022 15:40
@DLu DLu mentioned this pull request May 13, 2022
6 tasks
DLu added a commit to DLu/moveit2 that referenced this pull request May 19, 2022
DLu added a commit to DLu/moveit2 that referenced this pull request Jun 13, 2022
DLu added a commit to DLu/moveit2 that referenced this pull request Jun 13, 2022
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.

None yet

2 participants