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

Fix deferred robot model loading #2244

Merged
merged 3 commits into from
Aug 13, 2020
Merged

Conversation

rhaschke
Copy link
Contributor

This is a cleanup of #2223. Fixes #2222.
Note that the melodic-devel branch is missing #1625. For this reason the PR here doesn't apply 1:1 to melodic.
I will file a similar PR for melodic.

rhaschke and others added 3 commits August 10, 2020 21:15
This reverts commit 4e72ac5
as the delayed loading results in link properties NOT being loaded.
This is a (in my opinion) rather dirty workaround because RViz
enables Displays systematically *before* loading their properties.

So the patch loads the required property a second time *before* everything else.

Assuming this ever changes we can remove this code again.

A Display's "enabled" state is encoded in a boolean property the Display inherits from.
The way loading works (recursively running through the properties)
this special property is loaded first and triggers onEnable because
of the Property's changed() signal.

A second "Enabled" property exists in RViz's Displays but does not change behavior at all.
@rhaschke rhaschke requested a review from tylerjw as a code owner August 10, 2020 19:30
@v4hn
Copy link
Contributor

v4hn commented Aug 10, 2020

This is a cleanup of #2223

I would consider it a rewrite.

@furushchev please have a try on whether this works as expected in your setup.

@rhaschke
Copy link
Contributor Author

This is a cleanup of #2223

I would consider it a rewrite.

It is cleaning the history of #2223, which didn't reflect (anymore) what we actually did 😉
@furushchev, please find the corresponding melodic version in #2245.

@codecov
Copy link

codecov bot commented Aug 10, 2020

Codecov Report

Merging #2244 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #2244   +/-   ##
=======================================
  Coverage   57.73%   57.73%           
=======================================
  Files         326      326           
  Lines       25629    25629           
=======================================
  Hits        14797    14797           
  Misses      10832    10832           
Impacted Files Coverage Δ
...ipulation/pick_place/src/manipulation_pipeline.cpp 76.41% <0.00%> (-0.95%) ⬇️
...raint_samplers/src/default_constraint_samplers.cpp 82.90% <0.00%> (+0.36%) ⬆️

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 3f2924c...1a6c0b4. Read the comment docs.

@rhaschke
Copy link
Contributor Author

Ping @furushchev: This is awaiting your approval.

Copy link
Contributor

@v4hn v4hn left a comment

Choose a reason for hiding this comment

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

I verified this in master. Thanks.

@v4hn v4hn merged commit 9cd0ac3 into moveit:master Aug 13, 2020
@rhaschke rhaschke deleted the fix-robot-model-loading branch August 13, 2020 18:47
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.

RViZ/Trajectory: checkbox selection of displaying for each link is not saved
2 participants