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

Migrate MarkerArrayDisplay #296

Merged
merged 7 commits into from
Jun 15, 2018

Conversation

greimela-si
Copy link
Contributor

This PR migrates the MarkerArrayDisplay to ros2/rviz.
Closes #104.

In this context we noticed that both the MarkerDisplay and the MarkerArrayDisplay are able to display MarkerArray messages, the feature being kind of hidden in the first case.

@wjwwood: Any idea why the MarkerDisplay is able to additionally display MarkerArray messages? It feels like the feature does not provide any value since the MarkerArrayDisplay exists as well.

@wjwwood wjwwood added the in review Waiting for review (Kanban column) label Jun 13, 2018
@greimela-si
Copy link
Contributor Author

CI:

  • Linux Build Status
  • Linux-aarch64 Build Status
  • macOS Build Status
  • Windows Build Status

@wjwwood wjwwood added in progress Actively being worked on (Kanban column) and removed in review Waiting for review (Kanban column) labels Jun 14, 2018
@greimela-si greimela-si force-pushed the feature/migrate_marker_array_display branch from f303104 to 7ba84ff Compare June 14, 2018 13:45
@greimela-si
Copy link
Contributor Author

CI after rebase:

  • Linux Build Status
  • Linux-aarch64 Build Status
  • macOS Build Status
  • Windows Build Status

@greimela-si
Copy link
Contributor Author

@wjwwood We added the last commit (7ba84ff) only the make the tests pass. This commit resolves an undetected merge error from last night and will be published as a pr of its own. The last commit will cause a conflict once the other pr is merged. Simply remove the last commit from this pr before merging will work.

@wjwwood wjwwood added in review Waiting for review (Kanban column) and removed in progress Actively being worked on (Kanban column) labels Jun 15, 2018
@wjwwood wjwwood merged commit 467164b into ros2:ros2 Jun 15, 2018
@wjwwood wjwwood removed the in review Waiting for review (Kanban column) label Jun 15, 2018
@Martin-Idel-SI Martin-Idel-SI deleted the feature/migrate_marker_array_display branch June 15, 2018 12:33
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