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

Handle __model__ in joint parent or child when using merge-include #835

Merged
merged 1 commit into from
Jan 28, 2022

Conversation

azeey
Copy link
Collaborator

@azeey azeey commented Jan 27, 2022

🦟 Bug fix

Summary

With #833 allowed using __model__ in //joint/parent or //joint/child. When merge-including models that include such cases, the __model__ has to be changed to the proxy frame.

Checklist

  • Signed all commits for DCO
  • Added tests
  • [ ] Updated documentation (as needed)
  • [ ] Updated migration guide (as needed)
  • codecheck passed (See contributing)
  • All tests passed (See test coverage)
  • While waiting for a review on your PR, please help review another open pull request to support the maintainers

Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining Signed-off-by messages.

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
@azeey azeey requested a review from scpeters as a code owner January 27, 2022 20:41
@azeey azeey self-assigned this Jan 27, 2022
@github-actions github-actions bot added the 🏯 fortress Ignition Fortress label Jan 27, 2022
@osrf-triage osrf-triage added this to Inbox in Core development Jan 27, 2022
@chapulina chapulina moved this from Inbox to In progress in Core development Jan 27, 2022
@codecov-commenter
Copy link

Codecov Report

Merging #835 (1f1daea) into sdf12 (0351a39) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@           Coverage Diff           @@
##            sdf12     #835   +/-   ##
=======================================
  Coverage   90.70%   90.71%           
=======================================
  Files          78       78           
  Lines       12441    12447    +6     
=======================================
+ Hits        11285    11291    +6     
  Misses       1156     1156           
Impacted Files Coverage Δ
src/parser.cc 87.58% <100.00%> (+0.06%) ⬆️

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 0351a39...1f1daea. Read the comment docs.

@azeey azeey moved this from In progress to In review in Core development Jan 27, 2022
@azeey azeey merged commit 1d833c1 into gazebosim:sdf12 Jan 28, 2022
Core development automation moved this from In review to Done Jan 28, 2022
@azeey azeey deleted the model_in_joint_merge_include branch January 28, 2022 17:14
@osrf-triage
Copy link

This pull request has been mentioned on Gazebo Community. There might be relevant details there:

https://community.gazebosim.org/t/new-ignition-releases-2022-04-13-fortress-edifice/1367/1

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

Successfully merging this pull request may close these issues.

None yet

4 participants