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) #333

Merged
merged 18 commits into from
Dec 8, 2021
Merged

6 ➡️ 7 (main) #333

merged 18 commits into from
Dec 8, 2021

Conversation

chapulina
Copy link
Contributor

➡️ 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)

NickNair and others added 17 commits November 11, 2021 09:39
@NickNair @chapulina
Added log storing for ign-gui (#272)
970914a 
Signed-off-by: Nikhil Nair <nikhilnicky972@gmail.com>
Signed-off-by: Louise Poubel <louise@openrobotics.org>

Co-authored-by: Louise Poubel <louise@openrobotics.org>
@chapulina
Don't crash if a plugin has invalid QML (#315)
8b3f2b0 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina
Set marker point size from message (#317)
d695669 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina
Don't set visual scale for point markers (#321)
f8af480 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@srmainwaring
Fix TopicEcho plugin message display (#322)
aa8632d 
- Change binding of width property in delegate (see: https://stackoverflow.com/questions/63767669/parent-is-null-in-listview-delegate-after-upgrade-to-qt-5-15)
- Use scoped reference to model.display (see: https://forum.qt.io/topic/92085/using-qstringlistmodel-as-model-in-listview)

Signed-off-by: Rhys Mainwaring <rhys.mainwaring@me.com>
@zflat @chapulina
Use qmldir to define QML module with IgnSpinBox (#319)
1827899 
Signed-off-by: William Wedler <william.wedler@resquared.com>
Co-authored-by: Louise Poubel <louise@openrobotics.org>
@chapulina
Add PreRender event to MinimalScene (#325)
679744a 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina @ahcorde
Offer a way to disable warnings on marker manager (#326)
7b0ae65 
Signed-off-by: Louise Poubel <louise@openrobotics.org>

Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
@chapulina
Fix codecheck (#329)
803bf23 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina
3 ➡️ 4
c2bdfff 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina
3 ➡️ 4 (#328)
62e5105 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina
4 ➡️ 5
bf57a80 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina
4 ➡️ 5 (#330)
01c2eff 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@jennuine
merge 5 into 6
6034197 
Signed-off-by: Jenn Nguyen <jenn@openrobotics.org>
@chapulina
5 ➡️ 6 (#331)
dc3c2ed 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina
Fix codecheck (#332)
3b57ac2 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina
Grid config: set values from startup and improve layout (#324)
7f047db 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina chapulina requested a review from jennuine as a code owner December 8, 2021 04:01
@github-actions github-actions bot added the 🌱 garden Ignition Garden label Dec 8, 2021
@chapulina chapulina mentioned this pull request Dec 8, 2021
Merged
11 tasks
chapulina
chapulina commented Dec 8, 2021
View reviewed changes
test/plugins/TestInvalidQmlPlugin.qml
@@ -1,5 +1,5 @@
/*
Copy link
Contributor Author

Choose a reason for hiding this comment

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

So weird for GitHub to say this is a moved file. One was deleted in #324 and the other was added in #315

@codecov
Copy link

codecov bot commented Dec 8, 2021 •
edited
Loading

Codecov Report

Merging #333 (7c7c9d6) into main (67a78e4) will decrease coverage by 1.25%.
The diff coverage is 35.25%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #333      +/-   ##
==========================================
- Coverage   65.67%   64.41%   -1.26%     
==========================================
  Files          34       36       +2     
  Lines        4751     4952     +201     
==========================================
+ Hits         3120     3190      +70     
- Misses       1631     1762     +131
Impacted Files Coverage Δ
include/ignition/gui/GuiEvents.hh 100.00% <ø> (ø)
include/ignition/gui/Helpers.hh 100.00% <ø> (ø)
src/plugins/grid_config/GridConfig.hh 100.00% <ø> (ø)
src/plugins/grid_config/GridConfig.cc 22.35% <25.00%> (ø)
src/plugins/marker_manager/MarkerManager.cc 58.88% <30.76%> (-0.58%) ⬇️
src/ign.cc 44.68% <70.00%> (+6.84%) ⬆️
src/Application.cc 84.74% <100.00%> (+0.15%) ⬆️
src/GuiEvents.cc 100.00% <100.00%> (ø)
src/Helpers.cc 93.47% <100.00%> (+0.14%) ⬆️
src/plugins/minimal_scene/MinimalScene.cc 61.21% <100.00%> (+0.28%) ⬆️
... and 3 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 67a78e4...7c7c9d6. Read the comment docs.

@chapulina chapulina changed the title 6 ➡️ 7 6 ➡️ 7 Dec 8, 2021
@chapulina chapulina changed the title 6 ➡️ 7 6 ➡️ 7 (main) Dec 8, 2021
@chapulina
6 -> 7
7c7c9d6 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina chapulina merged commit 71e3f6c into main Dec 8, 2021
@chapulina chapulina deleted the chapulina/6_to_7 branch December 8, 2021 22:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jennuine jennuine jennuine approved these changes

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 @jennuine @NickNair @srmainwaring @zflat