Do not use assume every RenderPanel has a ViewController. #613
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Get the Viewport from its RenderWindow instead. Ensures interactive markers work (and do not make rviz crash) when interaction goes through a camera feed and not the main window. Signed-off-by: Michel Hidalgo <michel@ekumenlabs.com>
|
@mjcarroll any chance we can backport this to Eloquent? |
jacobperron
approved these changes
Oct 19, 2020
There was a problem hiding this comment.
LGTM
@hidmic I'm happy to review backports to Foxy and Eloquent if you want to open up PRs.
wjwwood
approved these changes
Oct 19, 2020
|
Alright, going in! |
hidmic
added a commit
that referenced
this pull request
Oct 20, 2020
Get the Viewport from its RenderWindow instead. Ensures interactive markers work (and do not make rviz crash) when interaction goes through a camera feed and not the main window. Signed-off-by: Michel Hidalgo <michel@ekumenlabs.com>
hidmic
added a commit
that referenced
this pull request
Oct 20, 2020
Get the Viewport from its RenderWindow instead. Ensures interactive markers work (and do not make rviz crash) when interaction goes through a camera feed and not the main window. Signed-off-by: Michel Hidalgo <michel@ekumenlabs.com>
This was referenced Oct 20, 2020
hidmic
added a commit
that referenced
this pull request
Oct 20, 2020
Get the Viewport from its RenderWindow instead. Ensures interactive markers work (and do not make rviz crash) when interaction goes through a camera feed and not the main window. Signed-off-by: Michel Hidalgo <michel@ekumenlabs.com>
hidmic
added a commit
that referenced
this pull request
Oct 20, 2020
Get the Viewport from its RenderWindow instead. Ensures interactive markers work (and do not make rviz crash) when interaction goes through a camera feed and not the main window. Signed-off-by: Michel Hidalgo <michel@ekumenlabs.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request gets the current
Ogre::Viewportfrom the panel'sRenderWindowinstead of assuming it'll have anrviz_common::ViewController(which it doesn't if the panel is that of arviz_default_plugins::Cameradisplay.With this patch, interactive markers work (and do not make
rvizcrash) when a user attempts to interact with marker controls via camera feed (which, to my surprise, is supported on ROS 1).CI up to
rviz2,rviz_default_plugins, andrviz_rendering_tests: