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

Restore Add System GUI plugin #1685

Merged
merged 2 commits into from
Oct 3, 2022
Merged

Restore Add System GUI plugin #1685

merged 2 commits into from
Oct 3, 2022

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented Sep 1, 2022

Signed-off-by: Ian Chen [email protected]

🦟 Bug fix

Summary

The Add System GUI plugin was added in #1549 but removed during forward port #1626. This PR restores the feature.

Checklist

  • Signed all commits for DCO
  • Added tests
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • Consider updating Python bindings (if the library has them)
  • codecheck passed (See contributing)
  • All tests passed (See test coverage)
  • While waiting for a review on your PR, please help review another open pull request to support the maintainers

Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining Signed-off-by messages.

Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
@github-actions github-actions bot added the 🏯 fortress Ignition Fortress label Sep 1, 2022
@chapulina chapulina added the bug Something isn't working label Sep 1, 2022
@chapulina chapulina added the GUI Gazebo's graphical interface (not pure Ignition GUI) label Sep 1, 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.

wow I wonder how I messed up that forward-port so badly, thanks for the fix!

@codecov
Copy link

codecov bot commented Sep 2, 2022

Codecov Report

Merging #1685 (d598c62) into ign-gazebo6 (545b364) will decrease coverage by 0.10%.
The diff coverage is 38.79%.

@@               Coverage Diff               @@
##           ign-gazebo6    #1685      +/-   ##
===============================================
- Coverage        64.67%   64.57%   -0.11%     
===============================================
  Files              321      321              
  Lines            26062    26166     +104     
===============================================
+ Hits             16856    16897      +41     
- Misses            9206     9269      +63     
Impacted Files Coverage Δ
include/ignition/gazebo/SystemLoader.hh 100.00% <ø> (ø)
.../plugins/component_inspector/ComponentInspector.hh 28.57% <ø> (ø)
.../plugins/component_inspector/ComponentInspector.cc 5.31% <2.77%> (-0.31%) ⬇️
src/SystemLoader.cc 67.46% <94.11%> (+3.95%) ⬆️
src/SystemManager.cc 97.63% <100.00%> (+0.55%) ⬆️
src/SimulationRunner.cc 91.89% <0.00%> (+0.95%) ⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@azeey
Copy link
Contributor

azeey commented Oct 3, 2022

Good to merge.

@iche033 iche033 merged commit cdc9dc2 into ign-gazebo6 Oct 3, 2022
@iche033 iche033 deleted the add_sytem_gui branch October 3, 2022 18:59
nkoenig added a commit that referenced this pull request Nov 2, 2022
* Add topic parameter to thrust plugin (#1681)

* Add topic parameter.

Signed-off-by: Carlos Agüero <[email protected]>

* 🎈 6.12.0: bumped minor and updated changelog (#1682)

* bumped minor and updated changelog

Signed-off-by: Dharini Dutia <[email protected]>

* fixed changelog as per feedback and updated migration guide

Signed-off-by: Dharini Dutia <[email protected]>

Signed-off-by: Dharini Dutia <[email protected]>

* Fix reference link in ackermann steering (#1683)

Signed-off-by: Kenji Brameld <[email protected]>

* Fix installation instructions on Ubuntu 22.04 (#1686)

Signed-off-by: Silvio Traversaro <[email protected]>

* Add a service to trigger functionality (#1611)

* initial commit to allow plugin to call a service

Signed-off-by: Liam Han <[email protected]>

* adding tutorial and modifying the world sdf

Signed-off-by: Liam Han <[email protected]>

* added test for single input and single service output

Signed-off-by: Liam Han <[email protected]>

* added test for single input and multiple service output

Signed-off-by: Liam Han <[email protected]>

* added test for invalid matching service name => timeout

Signed-off-by: Liam Han <[email protected]>

* modified variables the camelCase

Signed-off-by: Liam Han <[email protected]>

* fixed typo, indentation, grammar, lines that exceeded 80 char

Signed-off-by: Liam Han <[email protected]>

* fixing ubuntu bionic ci issue

Signed-off-by: Liam Han <[email protected]>

* silly syntax mistake on expect_eq

Signed-off-by: Liam Han <[email protected]>

* added three more test cases that addesses incorrect response type, incorrect request type and false result

Signed-off-by: Liam Han <[email protected]>

* WIP: major restructuring and currently working. Requires more cleanup and test

Signed-off-by: Liam Han <[email protected]>

* WIP: fixed preprocessor define bug

Signed-off-by: Liam Han <[email protected]>

* WIP: working but extremely convoluted

Signed-off-by: Liam Han <[email protected]>

* WIP major modification but a lot of errors and tests failed

Signed-off-by: Liam Han <[email protected]>

* stable version: had to revert back to previous work. all tests passed

Signed-off-by: Liam Han <[email protected]>

* modified to use blocking Request method as well as reduce a service worker thread to just one thread with the publisher. all tests passed

Signed-off-by: Liam Han <[email protected]>

* stable version: had to revert back to previous work. all tests passed

Signed-off-by: Liam Han <[email protected]>

* successfully reverted and tested

Signed-off-by: Liam Han <[email protected]>

* fixing PR suggestions

Signed-off-by: Liam Han <[email protected]>

* changed string with 'serv' to 'srv' and included <mutex> to the header

Signed-off-by: Liam Han <[email protected]>

* fixed indentation and removed rep.set_data since it's unused on the client service

Signed-off-by: Liam Han <[email protected]>

* getting rid of the id

Signed-off-by: Liam Han <[email protected]>

* fixed race condition resulting seldom test failure

Signed-off-by: Liam Han <[email protected]>

* changed from triggerSrv to serviceCount. This compensates for the two threads running at different rate

Signed-off-by: Liam Han <[email protected]>

* braces indentation

Signed-off-by: Mabel Zhang <[email protected]>

* addressing gnu c compiler (gcc) warnings

Signed-off-by: Liam Han <[email protected]>

Signed-off-by: Liam Han <[email protected]>
Signed-off-by: Mabel Zhang <[email protected]>
Co-authored-by: Mabel Zhang <[email protected]>

* Fix loading render engine plugins in GUI  (#1694)

Signed-off-by: Ian Chen <[email protected]>

* Enable inherited model topic name. (#1689)

Allows for inheriting model name for robotNamespace when SDF element is not set and provides a debug message showing the topics it subscribes to.

Signed-off-by: Benjamin Perseghetti <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>

* Add ResourceSpawner example file (#1701)

Add an example file for the ResourceSpawner plugin. I'm using this to link from https://github.com/gazebosim/docs/blob/master/garden/Model_insertion_fuel.md. To improve gazebosim/garden-tutorial-party#1991.

Signed-off-by: Jose Luis Rivero <[email protected]>
Co-authored-by: Alejandro Hernández Cordero <[email protected]>

* Update triggered_publisher.sdf (#1737)

found a silly typo that was pushed back in PR (#1611)

* Adds sky cubemap URI to the sky.proto's header (#1739)

* Adds sky cubemap URI to the sky.proto's header

Signed-off-by: Nate Koenig <[email protected]>

* require sdf 12.6

Signed-off-by: Nate Koenig <[email protected]>

Signed-off-by: Nate Koenig <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>

* Return absolute path when finding a resource (#1741)

* Adds sky cubemap URI to the sky.proto's header

Signed-off-by: Nate Koenig <[email protected]>

* Return absolute path when finding a resource

Signed-off-by: Nate Koenig <[email protected]>

Signed-off-by: Nate Koenig <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>

* Restore Add System GUI plugin (#1685)

* cherry pick aef3020

Signed-off-by: Ian Chen <[email protected]>

* Adding thrust coefficient calculation (#1652)

* adding thrust coefficient calculation

Signed-off-by: Marco A. Gutierrez <[email protected]>

* Update src/systems/thruster/Thruster.cc

Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>

* Update src/systems/thruster/Thruster.cc

Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>

* Update src/systems/thruster/Thruster.cc

Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>

* Update src/systems/thruster/Thruster.cc

Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>

* Update src/systems/thruster/Thruster.cc

Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>

* Update src/systems/thruster/Thruster.cc

Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>

* Update src/systems/thruster/Thruster.cc

Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>

* Update src/systems/thruster/Thruster.cc

Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>

* Update src/systems/thruster/Thruster.hh

Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>

* thrust coefficient test and behavior updates

Signed-off-by: Marco A. Gutierrez <[email protected]>

* making float comparision more robust

Signed-off-by: Marco A. Gutierrez <[email protected]>

* fix float comparision and lint

Signed-off-by: Marco A. Gutierrez <[email protected]>

Signed-off-by: Marco A. Gutierrez <[email protected]>
Co-authored-by: Alejandro Hernández Cordero <[email protected]>

* Enable/Disable individual hydrodynamic components. (#1692)

This commit enables and disables individual components of the hydrodynamics. This is often useful for debugging odd behaviours of a hydrodynamic model.

* Fortress: Removed warnings (#1754)

* Fortress: Removed warnings

* Removed unused speedlimit file (#1761)

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

* Enable use of ign gazebo -s on Windows (take two) (#1764)

* Enable use of ign gazebo -s on Windows

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

* Update src/CMakeLists.txt

Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Silvio <[email protected]>

* Fix cmdmodel6.rb and cmdgazebo6.rb contining the same code

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

Signed-off-by: Silvio <[email protected]>
Co-authored-by: Alejandro Hernández Cordero <[email protected]>

* Script and tutorial for generating procedural datasets with Blender (#1412)

Signed-off-by: Andrej Orsula <[email protected]>

* Fix scene_broadcaster_system test (#1766)

Signed-off-by: Nate Koenig <[email protected]>

Signed-off-by: Nate Koenig <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>

* Lint

Signed-off-by: Michael Carroll <[email protected]>

* Clean build and update test

Signed-off-by: Nate Koenig <[email protected]>

Signed-off-by: Carlos Agüero <[email protected]>
Signed-off-by: Dharini Dutia <[email protected]>
Signed-off-by: Kenji Brameld <[email protected]>
Signed-off-by: Silvio Traversaro <[email protected]>
Signed-off-by: Liam Han <[email protected]>
Signed-off-by: Mabel Zhang <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Benjamin Perseghetti <[email protected]>
Signed-off-by: Jose Luis Rivero <[email protected]>
Signed-off-by: Nate Koenig <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>
Signed-off-by: ahcorde <[email protected]>
Signed-off-by: Silvio <[email protected]>
Signed-off-by: Andrej Orsula <[email protected]>
Signed-off-by: Michael Carroll <[email protected]>
Co-authored-by: Carlos Agüero <[email protected]>
Co-authored-by: Dharini Dutia <[email protected]>
Co-authored-by: Kenji Brameld <[email protected]>
Co-authored-by: Silvio Traversaro <[email protected]>
Co-authored-by: Liam Han <[email protected]>
Co-authored-by: Mabel Zhang <[email protected]>
Co-authored-by: Ian Chen <[email protected]>
Co-authored-by: Benjamin Perseghetti <[email protected]>
Co-authored-by: Jose Luis Rivero <[email protected]>
Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>
Co-authored-by: Marco A. Gutierrez <[email protected]>
Co-authored-by: Arjo Chakravarty <[email protected]>
Co-authored-by: Andrej Orsula <[email protected]>
Co-authored-by: Michael Carroll <[email protected]>
@scpeters scpeters mentioned this pull request Nov 3, 2022
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working 🏯 fortress Ignition Fortress GUI Gazebo's graphical interface (not pure Ignition GUI)
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants