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

ign -> gz Header Migration : gz-gui #395

Merged
merged 4 commits into from
May 14, 2022
Merged

ign -> gz Header Migration : gz-gui #395

merged 4 commits into from
May 14, 2022

Conversation

methylDragon
Copy link
Contributor

@github-actions github-actions bot added the 🌱 garden Ignition Garden label May 6, 2022
@methylDragon methylDragon marked this pull request as draft May 6, 2022 22:16
@methylDragon methylDragon force-pushed the header_migration branch 2 times, most recently from 5a7e885 to b2212f2 Compare May 7, 2022 00:45
@methylDragon methylDragon marked this pull request as ready for review May 7, 2022 00:47
Signed-off-by: methylDragon <methylDragon@gmail.com>
methylDragon added a commit that referenced this pull request May 7, 2022
Signed-off-by: methylDragon <methylDragon@gmail.com>
methylDragon added a commit that referenced this pull request May 7, 2022
Signed-off-by: methylDragon <methylDragon@gmail.com>
methylDragon added a commit that referenced this pull request May 7, 2022
Signed-off-by: methylDragon <methylDragon@gmail.com>
@chapulina chapulina added the needs upstream release Blocked by a release of an upstream library label May 9, 2022
set(gz_gui_add_library_skip_parsing true)
gz_gui_add_library(${library_name})
endfunction()
function(gz_gui_add_library library_name)
Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks for going through the trouble here, but I believe this function is not exposed to downstream users. It's very specific to adding an official plugin to gz-gui itself.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No longer tick-tocked in bff9d86

Copy link
Contributor

Choose a reason for hiding this comment

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

All the uses will need to be updated as well, CI is failing with

CMake Error at src/plugins/camera_tracking/CMakeLists.txt:1 (ign_gui_add_plugin):
  Unknown CMake command "ign_gui_add_plugin".

///
/// 1. Paths given by the environment variable
/// 2. Paths added by calling addPluginPath
/// 3. Path ~/.gz/gui/plugins
Copy link
Contributor

Choose a reason for hiding this comment

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

Note to self that the implementation hasn't been updated to use ~/.gz yet

include/gz/gui/resources.qrc Show resolved Hide resolved
methylDragon added a commit that referenced this pull request May 11, 2022
Signed-off-by: methylDragon <methylDragon@gmail.com>
methylDragon added a commit that referenced this pull request May 11, 2022
Signed-off-by: methylDragon <methylDragon@gmail.com>
methylDragon added a commit that referenced this pull request May 11, 2022
Signed-off-by: methylDragon <methylDragon@gmail.com>
methylDragon added a commit that referenced this pull request May 11, 2022
Signed-off-by: methylDragon <methylDragon@gmail.com>
methylDragon added a commit that referenced this pull request May 11, 2022
Signed-off-by: methylDragon <methylDragon@gmail.com>
methylDragon added a commit that referenced this pull request May 11, 2022
Signed-off-by: methylDragon <methylDragon@gmail.com>
methylDragon added a commit that referenced this pull request May 11, 2022
Signed-off-by: methylDragon <methylDragon@gmail.com>
methylDragon added a commit that referenced this pull request May 11, 2022
Signed-off-by: methylDragon <methylDragon@gmail.com>
@codecov
Copy link

codecov bot commented May 11, 2022

Codecov Report

❗ No coverage uploaded for pull request base (main@bdbaaac). Click here to learn what that means.
The diff coverage is n/a.

❗ Current head f9a6933 differs from pull request most recent head 589074b. Consider uploading reports for the commit 589074b to get more accurate results

@@           Coverage Diff           @@
##             main     #395   +/-   ##
=======================================
  Coverage        ?   30.03%           
=======================================
  Files           ?       43           
  Lines           ?     1888           
  Branches        ?        0           
=======================================
  Hits            ?      567           
  Misses          ?     1321           
  Partials        ?        0           

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 bdbaaac...589074b. Read the comment docs.

@chapulina chapulina added ign to gz Renaming Ignition to Gazebo and removed needs upstream release Blocked by a release of an upstream library labels May 11, 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 as long as we don't get any unexpected test failures. This package has lots of flaky tests, I'll make another comment once all CI is back.

Signed-off-by: methylDragon <methylDragon@gmail.com>
Signed-off-by: methylDragon <methylDragon@gmail.com>
methylDragon added a commit that referenced this pull request May 12, 2022
Signed-off-by: methylDragon <methylDragon@gmail.com>
Signed-off-by: methylDragon <methylDragon@gmail.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.

CI looks good too, 🚢 it!

@methylDragon methylDragon merged commit 01a0753 into main May 14, 2022
@methylDragon methylDragon deleted the header_migration branch May 14, 2022 01:36
methylDragon added a commit that referenced this pull request May 14, 2022
Signed-off-by: methylDragon <methylDragon@gmail.com>
methylDragon added a commit that referenced this pull request May 14, 2022
Signed-off-by: methylDragon <methylDragon@gmail.com>
methylDragon added a commit that referenced this pull request May 14, 2022
Signed-off-by: methylDragon <methylDragon@gmail.com>
srmainwaring added a commit to srmainwaring/gz-gui that referenced this pull request May 21, 2022
… QML

- Adapt the GammaAdjust element from QtGraphicalEffects to work with Metal
- Add shaders from Qt
- Create a Vulkan supported version of the fragment shader
- Generate a shader pack using qsb
- Refactor gamma adjustment QML
- Move to own QML file and locate with ignition/gui/qml
- Move shaders to a private subfolder
- Update resources.qrc
- Replace import QtGraphicalEffects 1.0 with import "qrc:/qml"

Signed-off-by: Rhys Mainwaring <rhys.mainwaring@me.com>

Move header files with git mv (gazebosim#395)

Signed-off-by: methylDragon <methylDragon@gmail.com>

Create redirection aliases (gazebosim#395)

Signed-off-by: methylDragon <methylDragon@gmail.com>

Migrate sources in src, test, examples, and include (gazebosim#395)

Signed-off-by: methylDragon <methylDragon@gmail.com>

Migrate CMake files (gazebosim#395)

Signed-off-by: methylDragon <methylDragon@gmail.com>

Update name and logo on UI, examples and API docs (gazebosim#398)

Signed-off-by: Louise Poubel <louise@openrobotics.org>
srmainwaring added a commit to srmainwaring/gz-gui that referenced this pull request Jun 12, 2022
… QML

- Adapt the GammaAdjust element from QtGraphicalEffects to work with Metal
- Add shaders from Qt
- Create a Vulkan supported version of the fragment shader
- Generate a shader pack using qsb
- Refactor gamma adjustment QML
- Move to own QML file and locate with ignition/gui/qml
- Move shaders to a private subfolder
- Update resources.qrc
- Replace import QtGraphicalEffects 1.0 with import "qrc:/qml"

Signed-off-by: Rhys Mainwaring <rhys.mainwaring@me.com>

Move header files with git mv (gazebosim#395)

Signed-off-by: methylDragon <methylDragon@gmail.com>

Create redirection aliases (gazebosim#395)

Signed-off-by: methylDragon <methylDragon@gmail.com>

Migrate sources in src, test, examples, and include (gazebosim#395)

Signed-off-by: methylDragon <methylDragon@gmail.com>

Migrate CMake files (gazebosim#395)

Signed-off-by: methylDragon <methylDragon@gmail.com>

Update name and logo on UI, examples and API docs (gazebosim#398)

Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina chapulina mentioned this pull request Aug 1, 2022
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🌱 garden Ignition Garden ign to gz Renaming Ignition to Gazebo
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants