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

Improve Docking panel (backport #4717) #4723

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 16, 2024


Basic Info

Info Please fill out this column
Ticket(s) this addresses #4689
Primary OS tested on Ubuntu 24.04
Robotic platform tested on Morphia robot
Does this PR contain AI generated software? No

Description of contribution in a few bullet points

  • Improved internal state machine to fix randomly RVIZ crashes.
  • Improved the UI.
Captura desde 2024-10-07 12-43-26 Captura desde 2024-10-08 11-06-38
Before After

Description of documentation updates required from your changes


Future work that may be required in bullet points

For Maintainers:

  • Check that any new parameters added are updated in docs.nav2.org
  • Check that any significant change is added to the migration guide
  • Check that any new features OR changes to existing behaviors are reflected in the tuning guide
  • Check that any new functions have Doxygen added
  • Check that any new features have test coverage
  • Check that any new plugins is added to the plugins page
  • If BT Node, Additionally: add to BT's XML index of nodes for groot, BT package's readme table, and BT library lists

This is an automatic backport of pull request #4717 done by [Mergify](https://mergify.com).

* Added load and save panel

Signed-off-by: Alberto Tudela <ajtudela@gmail.com>

* Improved dock_panel state machine

Signed-off-by: Alberto Tudela <ajtudela@gmail.com>

* Added loading dock plugins log

Signed-off-by: Alberto Tudela <ajtudela@gmail.com>

* Redo UI

Signed-off-by: Alberto Tudela <ajtudela@gmail.com>

* Update tooltips

Signed-off-by: Alberto Tudela <ajtudela@gmail.com>

* Fix null-dereference

Signed-off-by: Alberto Tudela <ajtudela@gmail.com>

---------

Signed-off-by: Alberto Tudela <ajtudela@gmail.com>
(cherry picked from commit 682e089)

# Conflicts:
#	nav2_rviz_plugins/include/nav2_rviz_plugins/docking_panel.hpp
@mergify mergify bot added the conflicts label Oct 16, 2024
Copy link
Contributor Author

mergify bot commented Oct 16, 2024

Cherry-pick of 682e089 has failed:

On branch mergify/bp/jazzy/pr-4717
Your branch is up to date with 'origin/jazzy'.

You are currently cherry-picking commit 682e0891.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   nav2_rviz_plugins/src/docking_panel.cpp
	modified:   nav2_rviz_plugins/src/utils.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   nav2_rviz_plugins/include/nav2_rviz_plugins/docking_panel.hpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Copy link
Contributor Author

mergify bot commented Oct 16, 2024

@mergify[bot], all pull requests must be targeted towards the main development branch.
Once merged into main, it is possible to backport to @jazzy, but it must be in main
to have these changes reflected into new distributions.

@SteveMacenski SteveMacenski deleted the mergify/bp/jazzy/pr-4717 branch October 16, 2024 16:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants