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

Prefix nested model names when flattening #399

Merged
merged 1 commit into from
Oct 30, 2020

Conversation

scpeters
Copy link
Member

Currently the addNestedModel function in parser.cc prefixes link, joint, and frame names with the flattened model name delimited by "::". This applies the same prefix to the names of nested models within the flattened model as well. Motivated by #355 (review)

Currently the addNestedModel function in parser.cc prefixes
link, joint, and frame names with the flattened model name
delimited by "::". This applies the same prefix to the names
of nested models within the flattened model as well.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@codecov-io
Copy link

Codecov Report

Merging #399 into sdf10 will increase coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@           Coverage Diff           @@
##            sdf10     #399   +/-   ##
=======================================
  Coverage   87.36%   87.36%           
=======================================
  Files          60       60           
  Lines        9219     9220    +1     
=======================================
+ Hits         8054     8055    +1     
  Misses       1165     1165           
Impacted Files Coverage Δ
src/parser.cc 78.57% <100.00%> (+0.02%) ⬆️

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 050d78d...9b79c85. Read the comment docs.

Copy link
Collaborator

@EricCousineau-TRI EricCousineau-TRI left a comment

Choose a reason for hiding this comment

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

Looking

Reviewable status: 0 of 4 files reviewed, all discussions resolved (waiting on @azeey)

Copy link
Collaborator

@EricCousineau-TRI EricCousineau-TRI left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewed 4 of 4 files at r1.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @azeey)

@scpeters scpeters merged commit cfbae18 into gazebosim:sdf10 Oct 30, 2020
@scpeters scpeters deleted the flattened_nested_model_names branch October 30, 2020 06:29
scpeters added a commit to scpeters/sdformat that referenced this pull request Oct 30, 2020
Currently the addNestedModel function in parser.cc prefixes
link, joint, and frame names with the flattened model name
delimited by "::". This applies the same prefix to the names
of nested models within the flattened model as well.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
scpeters added a commit to scpeters/sdformat that referenced this pull request Oct 30, 2020
Currently the addNestedModel function in parser.cc prefixes
link, joint, and frame names with the flattened model name
delimited by "::". This applies the same prefix to the names
of nested models within the flattened model as well.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
scpeters added a commit that referenced this pull request Oct 30, 2020
Currently the addNestedModel function in parser.cc prefixes
link, joint, and frame names with the flattened model name
delimited by "::". This applies the same prefix to the names
of nested models within the flattened model as well.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@scpeters
Copy link
Member Author

I can't remember if we wanted to backport this to sdf9?

@EricCousineau-TRI
Copy link
Collaborator

I can't remember either :(

@azeey If there is a plan to release and incorporate a new sdf9 version, might you be able to try this (after Thanksgiving), capping it to like 15min of effort? (git cherry-pick and cross your fingers?)

azeey pushed a commit to azeey/sdformat that referenced this pull request Nov 24, 2020
Currently the addNestedModel function in parser.cc prefixes
link, joint, and frame names with the flattened model name
delimited by "::". This applies the same prefix to the names
of nested models within the flattened model as well.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
azeey pushed a commit that referenced this pull request Nov 25, 2020
Currently the addNestedModel function in parser.cc prefixes
link, joint, and frame names with the flattened model name
delimited by "::". This applies the same prefix to the names
of nested models within the flattened model as well.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
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

4 participants