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.

Sign up for GitHub

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

Jump to bottom

6 ➡️ 7 (main) #383

Merged
merged 23 commits into from
Apr 6, 2022
Merged

6 ➡️ 7 (main) #383

merged 23 commits into from
Apr 6, 2022

Conversation

chapulina
Copy link
Contributor

➡️ Forward port

Port ign-gui6to main

Branch comparison: main...ign-gui6

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

jennuine and others added 22 commits January 31, 2022 18:07
@jennuine
🎈 5.4.0 (#354)
ee901c4 
Signed-off-by: Jenn Nguyen <[email protected]>
@jennuine
🎈 6.4.0 (#355)
09c3a5e 
Signed-off-by: Jenn Nguyen <[email protected]>
@ahcorde
Removed unused code in MinimalScene plugin (#359)
dc268fe 
Signed-off-by: ahcorde <[email protected]>
@chapulina
Backport GridConfig improvements to Citadel's Grid3D (#363)
9fa41b6 
Signed-off-by: Louise Poubel <[email protected]>
@chapulina
Improve KeyPublisher's usability (#362)
fc2f870 
Signed-off-by: Louise Poubel <[email protected]>
@chapulina
Prevent MinimalScene 💥 if another scene is already loaded (#364)
70255cc 
Signed-off-by: Louise Poubel <[email protected]>
@chapulina @ahcorde
Populate plugins that were empty (#366)
ce4c368 
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: ahcorde <[email protected]>

Co-authored-by: ahcorde <[email protected]>
@chapulina @ahcorde
TransportSceneManager: Prevent freeze when inserted from menu (#365)
3d327f6 
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Alejandro Hernández Cordero <[email protected]>

Co-authored-by: Alejandro Hernández Cordero <[email protected]>
@chapulina
Fix menu scrolling when a new plugin is added (#368)
755b995 
Signed-off-by: Louise Poubel <[email protected]>
@ahcorde @chapulina
Added Snackbar qtquick object (#369)
5428d26 
Signed-off-by: ahcorde <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>

Co-authored-by: Louise Poubel <[email protected]>
@chapulina
Use ign-rendering's screenToScene functions (#372)
ec910ed 
Signed-off-by: Louise Poubel <[email protected]>
@chapulina
Fix some Qt warnings (#376)
c14f379 
Signed-off-by: Louise Poubel <[email protected]>
@ahcorde @chapulina
Added array to snackbar qml (#370)
3cd66a8 
Signed-off-by: ahcorde <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>

Co-authored-by: Louise Poubel <[email protected]>
@chapulina
3 -> 5
b3c07a5 
Signed-off-by: Louise Poubel <[email protected]>
@chapulina
3 ➡️ 5 (#377)
f0d1043 
Signed-off-by: Louise Poubel <[email protected]>
@chapulina
🎈🏁 5.5.0 (#378)
63e4f51 
Signed-off-by: Louise Poubel <[email protected]>
@chapulina
Avoid nullptr access in MinimalScene (#380)
32880e2 
Signed-off-by: Louise Poubel <[email protected]>
@scpeters @chapulina
Add Ubuntu Jammy CI (#374)
9b0cd1f 
Signed-off-by: Steve Peters <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>

Co-authored-by: Louise Poubel <[email protected]>
@iche033
set cameraPassCountPerGpuFlush to 6 (#381)
a2497cb 
Signed-off-by: Ian Chen <[email protected]>
@chapulina
5 ➡️ 6
3f7f361 
Signed-off-by: Louise Poubel <[email protected]>
@chapulina
5 ➡️ 6 (#382)
eac2fc2 
Signed-off-by: Louise Poubel <[email protected]>
@chapulina
6 ➡️ 7 (main)
c404c5c 
Signed-off-by: Louise Poubel <[email protected]>
@chapulina chapulina requested a review from jennuine as a code owner April 5, 2022 22:15
@chapulina chapulina mentioned this pull request Apr 5, 2022
Closed
@github-actions github-actions bot added the 🌱 garden Ignition Garden label Apr 5, 2022
@codecov
Copy link

codecov bot commented Apr 6, 2022 •
edited
Loading

Codecov Report

Merging #383 (966c73a) into main (962cf54) will increase coverage by 0.24%.
The diff coverage is 65.40%.

@@            Coverage Diff             @@
##             main     #383      +/-   ##
==========================================
+ Coverage   63.87%   64.12%   +0.24%     
==========================================
  Files          45       45              
  Lines        5459     5508      +49     
==========================================
+ Hits         3487     3532      +45     
- Misses       1972     1976       +4
Impacted Files Coverage Δ
include/ignition/gui/MainWindow.hh 100.00% <ø> (ø)
src/plugins/minimal_scene/MinimalScene.hh 100.00% <ø> (ø)
src/plugins/minimal_scene/MinimalSceneRhi.hh 100.00% <ø> (ø)
src/plugins/minimal_scene/MinimalSceneRhiOpenGL.hh 100.00% <ø> (ø)
src/plugins/screenshot/Screenshot.cc 30.12% <0.00%> (-3.22%) ⬇️
src/plugins/teleop/Teleop.cc 83.19% <37.50%> (-1.77%) ⬇️
src/plugins/marker_manager/MarkerManager.cc 59.41% <60.71%> (+0.53%) ⬆️
src/plugins/minimal_scene/MinimalScene.cc 65.35% <63.07%> (+2.38%) ⬆️
src/Application.cc 85.51% <66.66%> (-0.33%) ⬇️
src/plugins/image_display/ImageDisplay.cc 30.95% <66.66%> (+0.87%) ⬆️
... 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 962cf54...966c73a. Read the comment docs.

@chapulina chapulina merged commit 8bfb596 into main Apr 6, 2022
@chapulina chapulina deleted the chapulina/6_to_7 branch April 6, 2022 18:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ahcorde ahcorde ahcorde approved these changes

@jennuine jennuine Awaiting requested review from jennuine jennuine is a code owner

Assignees
No one assigned
Labels
🌱 garden Ignition Garden
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@chapulina @ahcorde @jennuine @scpeters @iche033