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

Forward-port 3 to 6 #434

Merged
merged 14 commits into from
Jul 14, 2022
Merged

Forward-port 3 to 6 #434

merged 14 commits into from
Jul 14, 2022

Conversation

AzulRadio
Copy link
Contributor

➡️ Forward port

Port ign-gui3 to ign-gui6

Branch comparison: ign-gui6...ign-gui3

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

Blast545 and others added 12 commits June 14, 2022 11:10
Signed-off-by: Jorge Perez <jjperez@ekumenlabs.com>
Signed-off-by: Mabel Zhang <mabel@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>

Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
Co-authored-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Jorge Perez <jjperez@ekumenlabs.com>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
* common widget GzColor

* implement Grid3D with the common widget

Signed-off-by: youhy <haoyuan2019@outlook.com>

Co-authored-by: Jenn Nguyen <jenn@openrobotics.org>
* Example running a dialog before the main window

Signed-off-by: Louise Poubel <louise@openrobotics.org>

* Revert FIXMEs

Signed-off-by: Louise Poubel <louise@openrobotics.org>
* Add common widget pose GUI

Signed-off-by: youhy <haoyuan2019@outlook.com>

Co-authored-by: Jenn Nguyen <jenn@openrobotics.org>
* common widget variables fix

* remove spacer

* change show to expand

Signed-off-by: youhy <haoyuan2019@outlook.com>
Signed-off-by: Mohamad <mohamad@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>

Co-authored-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: youhy <haoyuan2019@outlook.com>
Co-authored-by: Louise Poubel <louise@openrobotics.org>
Co-authored-by: Jenn Nguyen <jenn@openrobotics.org>
Signed-off-by: Jenn Nguyen <jenn@openrobotics.org>
Signed-off-by: youhy <haoyuan2019@outlook.com>
@github-actions github-actions bot added the 🏯 fortress Ignition Fortress label Jul 14, 2022
Copy link
Contributor

@chapulina chapulina left a comment

Choose a reason for hiding this comment

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

LGTM, just the example that needs to be updated. You can do that as a new commit to this branch, suffixed with (#434) so we can trace it back to this PR.

examples/standalone/start_dialog/CMakeLists.txt Outdated Show resolved Hide resolved
Signed-off-by: youhy <haoyuan2019@outlook.com>
@jennuine
Copy link
Contributor

This test is failing:

EXPECT_DOUBLE_EQ(60, camera->HFOV().Degree());

@chapulina should Haoyuan update the test to use EXPECT_NEAR?

@chapulina
Copy link
Contributor

Yeah I see it's very close, EXPECT_NEAR sounds good, thanks!

45: Expected equality of these values:
45:   60
45:   camera->HFOV().Degree()
45:     Which is: 60.000001368151501

Signed-off-by: youhy <haoyuan2019@outlook.com>
Copy link
Contributor

@chapulina chapulina left a comment

Choose a reason for hiding this comment

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

LGTM with happy CI. Remember to merge with commit, don't squash or rebase 😉

@codecov
Copy link

codecov bot commented Jul 14, 2022

Codecov Report

Merging #434 (15f131a) into ign-gui6 (2ba68b8) will increase coverage by 35.34%.
The diff coverage is 74.66%.

❗ Current head 15f131a differs from pull request most recent head 24bb4b3. Consider uploading reports for the commit 24bb4b3 to get more accurate results

@@              Coverage Diff              @@
##           ign-gui6     #434       +/-   ##
=============================================
+ Coverage     30.54%   65.89%   +35.34%     
=============================================
  Files            41       39        -2     
  Lines          1748     5257     +3509     
=============================================
+ Hits            534     3464     +2930     
- Misses         1214     1793      +579     
Impacted Files Coverage Δ
include/ignition/gui/MainWindow.hh 100.00% <ø> (ø)
src/Application.cc 86.52% <0.00%> (ø)
src/Dialog.cc 77.17% <76.71%> (ø)
src/plugins/camera_tracking/qrc_CameraTracking.cpp
include/ignition/gui/qrc_resources.cpp
src/plugins/world_stats/moc_WorldStats.cpp
include/ignition/gui/moc_Application.cpp
src/plugins/teleop/moc_Teleop.cpp
src/plugins/world_control/qrc_WorldControl.cpp
src/plugins/scene3d/moc_Scene3D.cpp
... and 73 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 2ba68b8...24bb4b3. Read the comment docs.

@AzulRadio AzulRadio merged commit 9f1d0f5 into ign-gui6 Jul 14, 2022
@AzulRadio AzulRadio deleted the azulradio/3_to_6_2022_7_14 branch July 14, 2022 22:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏯 fortress Ignition Fortress
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

6 participants