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

3 ➡️ 4 #234

Merged
merged 12 commits into from
Jun 22, 2021
Merged

3 ➡️ 4 #234

merged 12 commits into from
Jun 22, 2021

Conversation

chapulina
Copy link
Contributor

➡️ Forward port

Port ign-gui3 to ign-gui4

Branch comparison: ign-gui4...ign-gui3

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

🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸

scpeters and others added 11 commits March 18, 2021 10:28
Signed-off-by: Steve Peters <[email protected]>
We aren't using QTest anymore in ign-gui, so remove
the parts of check_test_ran.py that translated QTest
xml files into junit, since they don't work easily
on Windows and aren't needed any longer.

Fixes #198.

Signed-off-by: Steve Peters <[email protected]>
* Start porting events from ign-gazebo

Signed-off-by: Louise Poubel <[email protected]>

* Remove test that fails due to #216

Signed-off-by: Louise Poubel <[email protected]>

* Move Scene3d_TEST.cc to test/integration

There seems to be a problem with loading the ignition-rendering-ogre
plugin from the Scene3D test if it links to that plugin. Making
Scene3D_TEST.cc into an integration test works because it doesn't
directly call any plugin methods.

This also changes the linking for the Grid3D plugin to only link
to the ignition-rendering core library target instead of the
IGNITION-RENDERING_LIBRARIES variable which includes the ogre
component library plugins.

Signed-off-by: Steve Peters <[email protected]>

* process qt events to allow scene to initialize

Signed-off-by: Steve Peters <[email protected]>

* Add test helper to check event

Signed-off-by: Louise Poubel <[email protected]>

* added more tests

Signed-off-by: ahcorde <[email protected]>

* make linters happy

Signed-off-by: ahcorde <[email protected]>

* Move TestHelper code to .cc file, fix windows?

Signed-off-by: Steve Peters <[email protected]>

* Fix windows?

Signed-off-by: ahcorde <[email protected]>

* Fix windows?

Signed-off-by: Alejandro Hernández <[email protected]>

* Expect values of Vector3 point in click events

Signed-off-by: Steve Peters <[email protected]>

* Remove debug message

Signed-off-by: Steve Peters <[email protected]>

* Remove unused variable

Signed-off-by: Steve Peters <[email protected]>

Co-authored-by: Steve Peters <[email protected]>
Co-authored-by: ahcorde <[email protected]>
* Adds confirmation dialog when closing window
* Updates docs and extends test coverage.
* Adds dialog_on_exit atribute to example .config

Signed-off-by: Franco Cipollone <[email protected]>
Signed-off-by: Jenn Nguyen <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
@github-actions github-actions bot added the 🔮 dome Ignition Dome label Jun 18, 2021
@ahcorde ahcorde added the needs upstream release Blocked by a release of an upstream library label Jun 18, 2021
Copy link
Contributor

@ahcorde ahcorde left a comment

Choose a reason for hiding this comment

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

it requires a ignition-rendering4 release

@chapulina chapulina mentioned this pull request Jun 18, 2021
7 tasks
@ahcorde
Copy link
Contributor

ahcorde commented Jun 21, 2021

@osrf-jenkins retest this please

@codecov
Copy link

codecov bot commented Jun 21, 2021

Codecov Report

Merging #234 (328fa1d) into ign-gui4 (def5df4) will increase coverage by 4.10%.
The diff coverage is 31.08%.

❗ Current head 328fa1d differs from pull request most recent head 6feab90. Consider uploading reports for the commit 6feab90 to get more accurate results
Impacted file tree graph

@@             Coverage Diff              @@
##           ign-gui4     #234      +/-   ##
============================================
+ Coverage     61.57%   65.68%   +4.10%     
============================================
  Files            21       24       +3     
  Lines          2790     3083     +293     
============================================
+ Hits           1718     2025     +307     
+ Misses         1072     1058      -14     
Impacted Files Coverage Δ
src/ign.cc 37.83% <ø> (ø)
src/plugins/grid_3d/Grid3D.cc 28.57% <0.00%> (ø)
src/plugins/image_display/ImageDisplay.cc 30.32% <0.00%> (+7.05%) ⬆️
src/plugins/key_publisher/KeyPublisher.cc 56.52% <ø> (ø)
src/plugins/topic_viewer/TopicViewer.cc 82.63% <ø> (ø)
src/Plugin.cc 57.44% <17.64%> (-2.83%) ⬇️
src/plugins/screenshot/Screenshot.cc 33.33% <33.33%> (ø)
src/plugins/world_stats/WorldStats.cc 94.78% <40.00%> (-2.50%) ⬇️
src/plugins/scene3d/Scene3D.cc 42.38% <40.67%> (+29.60%) ⬆️
src/plugins/world_control/WorldControl.cc 79.20% <75.00%> (-0.29%) ⬇️
... and 7 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 1fd25de...6feab90. Read the comment docs.

@ahcorde
Copy link
Contributor

ahcorde commented Jun 21, 2021

MacOS failure depends on this PR osrf/homebrew-simulation#1517

@chapulina chapulina removed the needs upstream release Blocked by a release of an upstream library label Jun 22, 2021
@chapulina chapulina merged commit 8e8f51c into ign-gui4 Jun 22, 2021
@chapulina chapulina deleted the chapulina/3_to_4 branch June 22, 2021 02:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🔮 dome Ignition Dome
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants