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

Merge 6 -> 7 #316

Merged
merged 18 commits into from
Nov 19, 2021
Merged

Merge 6 -> 7 #316

merged 18 commits into from
Nov 19, 2021

Conversation

scpeters
Copy link
Member

➡️ Forward port

Port ign-gui6 to main

Branch comparison: main...ign-gui6

Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)

darksylinc and others added 17 commits September 20, 2021 09:56
Fixes gazebosim/gz-sim#1011

Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
Signed-off-by: ahcorde <ahcorde@gmail.com>
Signed-off-by: Jenn Nguyen <jenn@openrobotics.org>
Signed-off-by: Jenn Nguyen <jenn@openrobotics.org>
Signed-off-by: Jenn Nguyen <jenn@openrobotics.org>
Signed-off-by: Jenn Nguyen <jenn@openrobotics.org>
Signed-off-by: Jenn Nguyen <jenn@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
* 🎈5.3.0

Signed-off-by: Jenn Nguyen <jenn@openrobotics.org>

* removed entry

Signed-off-by: Jenn Nguyen <jenn@openrobotics.org>
Signed-off-by: Jenn Nguyen <jenn@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
* share updated GUI ECM info with server on play

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* clarify docs and fix service request type

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* send event on play/pause/step

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* support service and event

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* fix tests

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* Flip the default settng of usEvent in order to maintain current behavior by default

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* ignore stats msgs triggered by a step

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* explicit constructor for new gui event

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* remove deprecation notes (support both event and service)

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* test event behavior

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* add missing helper test class

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* Disable tests on windows

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Address PR feedback

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
@scpeters
Copy link
Member Author

needed by gazebosim/gz-sim#1183

@codecov
Copy link

codecov bot commented Nov 18, 2021

Codecov Report

Merging #316 (7870d6a) into main (29d558c) will increase coverage by 0.31%.
The diff coverage is 85.86%.

❗ Current head 7870d6a differs from pull request most recent head 41e1e52. Consider uploading reports for the commit 41e1e52 to get more accurate results
Impacted file tree graph

@@            Coverage Diff             @@
##             main     #316      +/-   ##
==========================================
+ Coverage   65.42%   65.74%   +0.31%     
==========================================
  Files          32       34       +2     
  Lines        4686     4752      +66     
==========================================
+ Hits         3066     3124      +58     
- Misses       1620     1628       +8     
Impacted Files Coverage Δ
include/ignition/gui/GuiEvents.hh 100.00% <ø> (ø)
src/plugins/image_display/ImageDisplay.cc 30.08% <0.00%> (-0.25%) ⬇️
src/plugins/world_control/WorldControl.cc 76.86% <75.00%> (-2.34%) ⬇️
src/plugins/minimal_scene/MinimalScene.cc 60.92% <89.47%> (+1.99%) ⬆️
include/ignition/gui/Plugin.hh 100.00% <100.00%> (ø)
src/GuiEvents.cc 100.00% <100.00%> (ø)
...plugins/world_control/WorldControlEventListener.cc 100.00% <100.00%> (ø)
...plugins/world_control/WorldControlEventListener.hh 100.00% <100.00%> (ø)
src/plugins/scene3d/Scene3D.cc 49.09% <0.00%> (+0.25%) ⬆️
... and 1 more

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 29d558c...41e1e52. Read the comment docs.

Copy link
Contributor

@jennuine jennuine left a comment

Choose a reason for hiding this comment

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

LGTM, one minor comment

README.md Outdated
Comment on lines 12 to 15
Test coverage | [![codecov](https://codecov.io/gh/ignitionrobotics/ign-gui/branch/main/graph/badge.svg)](https://codecov.io/gh/ignitionrobotics/ign-gui/branch/main)
Ubuntu Bionic | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_gui-ci-main-bionic-amd64)](https://build.osrfoundation.org/job/ignition_gui-ci-main-bionic-amd64)
Homebrew | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_gui-ci-main-homebrew-amd64)](https://build.osrfoundation.org/job/ignition_gui-ci-main-homebrew-amd64)
Windows | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ign_gui-ci-win)](https://build.osrfoundation.org/job/ign_gui-ci-win)
Test coverage | [![codecov](https://codecov.io/gh/ignitionrobotics/ign-gui/branch/ign-gui6/graph/badge.svg)](https://codecov.io/gh/ignitionrobotics/ign-gui/branch/ign-gui6)
Ubuntu Bionic | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_gui-ci-ign-gui6-bionic-amd64)](https://build.osrfoundation.org/job/ignition_gui-ci-ign-gui6-bionic-amd64)
Homebrew | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_gui-ci-ign-gui6-homebrew-amd64)](https://build.osrfoundation.org/job/ignition_gui-ci-ign-gui6-homebrew-amd64)
Windows | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ign_gui-ign-6-win)](https://build.osrfoundation.org/job/ign_gui-ign-6-win)
Copy link
Contributor

Choose a reason for hiding this comment

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

I think these changes need to be reverted

Copy link
Member Author

Choose a reason for hiding this comment

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

agreed

Copy link
Member Author

Choose a reason for hiding this comment

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

fixed in a force-push amend: 41e1e52

@scpeters
Copy link
Member Author

some github actions test failures, but otherwise clean; I will merge now

@scpeters scpeters merged commit 5077fe8 into main Nov 19, 2021
@scpeters scpeters deleted the merge_6_7 branch November 19, 2021 01:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🌱 garden Ignition Garden
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants