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

fix updating a component's data via SerializedState msg #1131

Merged
merged 3 commits into from
Oct 22, 2021

Conversation

adlarkin
Copy link
Contributor

@adlarkin adlarkin commented Oct 21, 2021

Signed-off-by: Ashton Larkin ashton@openrobotics.org

🦟 Bug fix

Summary

While working on #1109, I found that there's a bug in ign-gazebo where an existing component's data isn't modified correctly through a msgs::SerializedState. There's also a TODO note about this in the code, which makes me think that this issue has existed for a while: https://github.com/ignitionrobotics/ign-gazebo/blob/447e5c231ec312bd0ce4e4d349222145e0e135d5/src/EntityComponentManager.cc#L1692-L1697

The issue is that if the default assignment operator is used between base classes, derived class data is lost in the assignment (we are using BaseComponent in src/EntityComponentManager.cc since that file doesn't have access to template types). The solution is to use BaseComponent::Deserialize, since this method is implemented by derived classes: https://github.com/ignitionrobotics/ign-gazebo/blob/ignition-gazebo6_6.0.0/include/ignition/gazebo/components/Component.hh#L358-L359

For a simple example of how derived class data is lost when using the default assignment operator between base classes, see https://godbolt.org/z/hezKTbeEj

I should also mention that this fix will need to be backported. I didn't target an older branch in this PR because this fix is needed by #1109, which is urgent and doesn't have time to wait for forward-ports/releases.

Test it

I have added unit tests for the EntityComponentManager class in this PR. Without the changes in this PR, the test that updates an ECM's component via a msgs::SerializedState fails.

Checklist

  • Signed all commits for DCO
  • Added tests
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • 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

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>
@github-actions github-actions bot added 🌱 garden Ignition Garden 🏯 fortress Ignition Fortress labels Oct 21, 2021
@adlarkin
Copy link
Contributor Author

@nkoenig @chapulina is there an existing issue open that would be fixed by this PR? If so, I will link it so that this PR closes the issue. I couldn't find any related issues when searching through the issue tracker in ign-gazebo. This scenario was never tested before, so my guess is that this wasn't a known issue until now.

adlarkin added a commit that referenced this pull request Oct 21, 2021
Signed-off-by: Ashton Larkin <ashton@openrobotics.org>
@codecov
Copy link

codecov bot commented Oct 21, 2021

Codecov Report

Merging #1131 (37e5af6) into ign-gazebo6 (1b4c9a0) will increase coverage by 0.11%.
The diff coverage is 69.23%.

Impacted file tree graph

@@               Coverage Diff               @@
##           ign-gazebo6    #1131      +/-   ##
===============================================
+ Coverage        63.72%   63.84%   +0.11%     
===============================================
  Files              256      256              
  Lines            20075    20076       +1     
===============================================
+ Hits             12793    12817      +24     
+ Misses            7282     7259      -23     
Impacted Files Coverage Δ
src/EntityComponentManager.cc 87.03% <69.23%> (+2.94%) ⬆️

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 1cf1ca4...37e5af6. Read the comment docs.

@nkoenig
Copy link
Contributor

nkoenig commented Oct 21, 2021

@nkoenig @chapulina is there an existing issue open that would be fixed by this PR? If so, I will link it so that this PR closes the issue. I couldn't find any related issues when searching through the issue tracker in ign-gazebo. This scenario was never tested before, so my guess is that this wasn't a known issue until now.

I don't think there is an issue for this. Thanks for fixing it.

Signed-off-by: Nate Koenig <nate@openrobotics.org>
@adlarkin adlarkin merged commit a2abed8 into ign-gazebo6 Oct 22, 2021
@adlarkin adlarkin deleted the adlarkin/stateMsg_update_component branch October 22, 2021 15:19
adlarkin added a commit that referenced this pull request Oct 27, 2021
Signed-off-by: Ashton Larkin <ashton@openrobotics.org>
adlarkin added a commit that referenced this pull request Oct 27, 2021
Signed-off-by: Ashton Larkin <ashton@openrobotics.org>
adlarkin added a commit that referenced this pull request Nov 5, 2021
Signed-off-by: Ashton Larkin <ashton@openrobotics.org>
nkoenig added a commit that referenced this pull request Nov 6, 2021
* get updated GUI ECM info in world control CB

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* working on adding tests

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* remove TODO note, issue fixed by #1131

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* apply GUI ECM's diff to server ECM at end of pause interval

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* use gui event to update server

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* handle step and support original control service

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* Reduced code duplication

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Set gazebo's default to use the event based system

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added more <use_event> flags

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* add header key to indicate a WorldControl step

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* remove deprecation notes (support both event and service)

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* Require version 6.1

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Nate Koenig <nkoenig@users.noreply.github.com>
chapulina pushed a commit that referenced this pull request Nov 9, 2021
…msg (#1149)

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>
@chapulina chapulina mentioned this pull request Nov 9, 2021
nkoenig added a commit that referenced this pull request Dec 2, 2021
* add an add entity button to component inspector. Currently only enabled for models

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* add model editor gui plugin that inserts visuals to the scene in the render thread

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* write to ECM

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* get updated GUI ECM info in world control CB

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* support adding light links

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* working on adding tests

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* remove TODO note, issue fixed by #1131

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* notify other GUI plugins of added/removed entities via GUI events

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* use const ref for constructor input params

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* guarantee 64 bit entity IDs with gazebo::Entity instead of unsigned int

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* testing makr as new entity  func

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* rm printouts

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* register type

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* refactor render util

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* apply GUI ECM's diff to server ECM at end of pause interval

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* use gui event to update server

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* Working on sensor addition and editing

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* handle step and support original control service

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* Reduced code duplication

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Set gazebo's default to use the event based system

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Testing things out

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* updates

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* workaround for avoiding crash on exit

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* refactor, comment out unused menu items

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* remove commented out code, add CreateLight function

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* add model editor src files

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* remove more commented out code

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* Fix build

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* use entity instead of entity name

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Update link add menu

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Updates

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added back in sensor menu

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Updates

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Updates

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Updates

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* use entity instead of entity name (#1176)

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>

* Adding sensors

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Add link menu updates (#1177)

* use entity instead of entity name

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Update link add menu

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Ian Chen <ichen@osrfoundation.org>

* fix adding ellipsoid

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* merge model_editor into component_inspector

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* fixing warnings

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* Adjust tool tips

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Updates

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* updates

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* updates

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Adding lidar menu

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* alphabetize

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Comment out sensors not supported

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added segmentation camera

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* fix id

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* fix codecheck

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fix submenue

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Remove lidar menu, and address comments

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* fix codecheck

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Merged

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Ian Chen <ichen@osrfoundation.org>
Co-authored-by: Ashton Larkin <ashton@openrobotics.org>
Co-authored-by: Ashton Larkin <42042756+adlarkin@users.noreply.github.com>
Co-authored-by: Nate Koenig <nate@openrobotics.org>
nkoenig added a commit that referenced this pull request Dec 10, 2021
* Model editor: Add links to model (#1165)

* add an add entity button to component inspector. Currently only enabled for models

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* add model editor gui plugin that inserts visuals to the scene in the render thread

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* write to ECM

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* support adding light links

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* notify other GUI plugins of added/removed entities via GUI events

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* use const ref for constructor input params

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* guarantee 64 bit entity IDs with gazebo::Entity instead of unsigned int

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* testing makr as new entity  func

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* rm printouts

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* register type

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* refactor render util

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* workaround for avoiding crash on exit

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* refactor, comment out unused menu items

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* remove commented out code, add CreateLight function

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* add model editor src files

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* remove more commented out code

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* use entity instead of entity name (#1176)

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>

* Add link menu updates (#1177)

* use entity instead of entity name

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Update link add menu

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Ian Chen <ichen@osrfoundation.org>

* fix adding ellipsoid

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* merge model_editor into component_inspector

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* fixing warnings

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* Adjust tool tips

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* fix adding light

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* Fix codecheck

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fixed documentation

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Ashton Larkin <ashton@openrobotics.org>
Co-authored-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Nate Koenig <nkoenig@users.noreply.github.com>

* Support recreating model entities (#1170)

* add recreate component and implement recreate entities functionality, add test

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* update test and make recreate entities with same name work

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* revert add include

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* style

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* Support editing air pressure sensor in the GUI

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Add noise to qrc

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Add noise to qrc

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fix lint

Signed-off-by: Michael Carroll <michael@openrobotics.org>

* Update sensor icon

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Move AirPressure functions out of ComponentInspector (#1179)

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

* Fix get decimals, and address comments

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* cleanup and simplification

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* check recreate comp in ancestor

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* require sdf 12.1.0

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Revert sdf version requirement

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fix codecheck

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* revert my bad merge

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* remvoe sensor icon

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Together (#1187)

* add an add entity button to component inspector. Currently only enabled for models

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* add model editor gui plugin that inserts visuals to the scene in the render thread

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* write to ECM

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* support adding light links

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* notify other GUI plugins of added/removed entities via GUI events

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* use const ref for constructor input params

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* guarantee 64 bit entity IDs with gazebo::Entity instead of unsigned int

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* testing makr as new entity  func

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* rm printouts

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* register type

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* refactor render util

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* workaround for avoiding crash on exit

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* refactor, comment out unused menu items

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* remove commented out code, add CreateLight function

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* add model editor src files

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* remove more commented out code

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* use entity instead of entity name (#1176)

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>

* Add link menu updates (#1177)

* use entity instead of entity name

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Update link add menu

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Ian Chen <ichen@osrfoundation.org>

* fix adding ellipsoid

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* merge model_editor into component_inspector

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* fixing warnings

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* Adjust tool tips

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* fix adding light

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* Fix codecheck

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fixed documentation

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Working on model creation

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fix build

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added debug statements

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* use each no cache

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* fix removing component from view

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* Fix physics

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fix codecheck

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Ian Chen <ichen@osrfoundation.org>
Co-authored-by: Ashton Larkin <ashton@openrobotics.org>
Co-authored-by: Nate Koenig <nate@openrobotics.org>

* Address comments

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* update cameras list on sensor removal

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* update cameras list on sensor removal

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* Require sensors 6.1

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* sensors 6.0.1

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Test model recreation with jointed models

Signed-off-by: Michael Carroll <michael@openrobotics.org>

* Fix multiple joints with same names

There was an issue in searching for joint parent_link and child_link frames
if there was another model with the same frame names.

This will correctly search for frame entity ids that are children of the
same model.

Signed-off-by: Michael Carroll <michael@openrobotics.org>

* Recreate entities joints (#1206)

* Test model recreation with jointed models
* Fix multiple joints with same names

There was an issue in searching for joint parent_link and child_link frames
if there was another model with the same frame names.

This will correctly search for frame entity ids that are children of the
same model.

Signed-off-by: Michael Carroll <michael@openrobotics.org>

* Fix the ecm test, which had bad parent-child relationships between links and joints

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added test for world joints

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Michael Carroll <michael@openrobotics.org>
Co-authored-by: Louise Poubel <louise@openrobotics.org>
Co-authored-by: Nate Koenig <nkoenig@users.noreply.github.com>
Co-authored-by: Ashton Larkin <ashton@openrobotics.org>

* Support editing air pressure sensor in the GUI (#1171)

* Support editing air pressure sensor in the GUI

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Add noise to qrc

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Add noise to qrc

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fix lint

Signed-off-by: Michael Carroll <michael@openrobotics.org>

* Update sensor icon

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Move AirPressure functions out of ComponentInspector (#1179)

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

* Fix get decimals, and address comments

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* cleanup and simplification

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Require sdf 12.1.0

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* missign width

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added simulation state aware spin box

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Remove console output

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added state awareness to add entity button

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fix codecheck

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Remove extra variable

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Michael Carroll <michael@openrobotics.org>
Co-authored-by: Louise Poubel <louise@openrobotics.org>

* Added altimeter sensor inspector (#1172)

* Support editing air pressure sensor in the GUI

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Add noise to qrc

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Add noise to qrc

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added altimeter sensor inspector

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fix lint

Signed-off-by: Michael Carroll <michael@openrobotics.org>

* Update sensor icon

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Move AirPressure functions out of ComponentInspector (#1179)

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

* Fix get decimals, and address comments

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* cleanup and simplification

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Require sdf 12.1.0

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* missign width

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added simulation state aware spin box

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Merged

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* merged

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Remove console output

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* alphabetize

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Documentation

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Michael Carroll <michael@openrobotics.org>
Co-authored-by: Louise Poubel <louise@openrobotics.org>

* Added magnetometer inspector (#1173)

* Support editing air pressure sensor in the GUI

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Add noise to qrc

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Add noise to qrc

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added altimeter sensor inspector

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added magnetometer inspector

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fix lint

Signed-off-by: Michael Carroll <michael@openrobotics.org>

* Update sensor icon

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Move AirPressure functions out of ComponentInspector (#1179)

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

* Fix get decimals, and address comments

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* cleanup and simplification

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Require sdf 12.1.0

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* missign width

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added simulation state aware spin box

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Merged

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* merged

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Remove console output

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* alphabetize

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fix build

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* alphabetize

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Cleanup build

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Missing print call

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Michael Carroll <michael@openrobotics.org>
Co-authored-by: Louise Poubel <louise@openrobotics.org>

* Add IMU component inspector (#1191)

* Support editing air pressure sensor in the GUI

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Add noise to qrc

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Add noise to qrc

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added altimeter sensor inspector

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added magnetometer inspector

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fix lint

Signed-off-by: Michael Carroll <michael@openrobotics.org>

* Update sensor icon

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Move AirPressure functions out of ComponentInspector (#1179)

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

* Fix get decimals, and address comments

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* cleanup and simplification

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Require sdf 12.1.0

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* missign width

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added simulation state aware spin box

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Merged

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* merged

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Remove console output

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* alphabetize

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fix build

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Add IMU component inspector

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* alphabetize

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Cleanup build

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Missing print call

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fix all codecheck issues

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Michael Carroll <michael@openrobotics.org>
Co-authored-by: Louise Poubel <louise@openrobotics.org>

* Added lidar component inspector (#1203)

* Support editing air pressure sensor in the GUI

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Add noise to qrc

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Add noise to qrc

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added altimeter sensor inspector

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added magnetometer inspector

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fix lint

Signed-off-by: Michael Carroll <michael@openrobotics.org>

* Update sensor icon

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Move AirPressure functions out of ComponentInspector (#1179)

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

* Fix get decimals, and address comments

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* cleanup and simplification

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Require sdf 12.1.0

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* missign width

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added simulation state aware spin box

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Merged

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* merged

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Remove console output

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* alphabetize

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fix build

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Add IMU component inspector

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added lidar component inspector

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fix codecheck

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Michael Carroll <michael@openrobotics.org>
Co-authored-by: Louise Poubel <louise@openrobotics.org>

* Model Editor: Add Joints to model (#1196)

* Model Editor: Add Joints to model

Signed-off-by: Michael Carroll <michael@openrobotics.org>

* Lint

Signed-off-by: Michael Carroll <michael@openrobotics.org>

* Style and documentation

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Suppress physics warnings on newly-created joints

Signed-off-by: Michael Carroll <michael@openrobotics.org>

* Added a header

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>

* Allow user to modify joint type (#1198)

* Support editing air pressure sensor in the GUI

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Add noise to qrc

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Add noise to qrc

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fix lint

Signed-off-by: Michael Carroll <michael@openrobotics.org>

* Update sensor icon

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Move AirPressure functions out of ComponentInspector (#1179)

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

* Fix get decimals, and address comments

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* cleanup and simplification

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Require sdf 12.1.0

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* missign width

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added simulation state aware spin box

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Remove console output

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Allow user to modify joint type

Signed-off-by: Michael Carroll <michael@openrobotics.org>

* Updated to use a separate class, and consolidate the look

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added recreate to joint add

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Louise Poubel <louise@openrobotics.org>

* Add sensors to a link via the GUI (#1188)

* add an add entity button to component inspector. Currently only enabled for models

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* add model editor gui plugin that inserts visuals to the scene in the render thread

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* write to ECM

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* get updated GUI ECM info in world control CB

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* support adding light links

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* working on adding tests

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* remove TODO note, issue fixed by #1131

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* notify other GUI plugins of added/removed entities via GUI events

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* use const ref for constructor input params

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* guarantee 64 bit entity IDs with gazebo::Entity instead of unsigned int

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* testing makr as new entity  func

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* rm printouts

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* register type

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* refactor render util

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* apply GUI ECM's diff to server ECM at end of pause interval

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* use gui event to update server

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* Working on sensor addition and editing

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* handle step and support original control service

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* Reduced code duplication

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Set gazebo's default to use the event based system

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Testing things out

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* updates

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* workaround for avoiding crash on exit

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* refactor, comment out unused menu items

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* remove commented out code, add CreateLight function

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* add model editor src files

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* remove more commented out code

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* Fix build

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* use entity instead of entity name

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Update link add menu

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Updates

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added back in sensor menu

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Updates

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Updates

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Updates

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* use entity instead of entity name (#1176)

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>

* Adding sensors

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Add link menu updates (#1177)

* use entity instead of entity name

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Update link add menu

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Ian Chen <ichen@osrfoundation.org>

* fix adding ellipsoid

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* merge model_editor into component_inspector

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* fixing warnings

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* Adjust tool tips

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Updates

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* updates

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* updates

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Adding lidar menu

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* alphabetize

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Comment out sensors not supported

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added segmentation camera

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* fix id

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* fix codecheck

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fix submenue

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Remove lidar menu, and address comments

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* fix codecheck

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Merged

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Ian Chen <ichen@osrfoundation.org>
Co-authored-by: Ashton Larkin <ashton@openrobotics.org>
Co-authored-by: Ashton Larkin <42042756+adlarkin@users.noreply.github.com>
Co-authored-by: Nate Koenig <nate@openrobotics.org>

* Support setting pose on links, visuals, collision via the GUI (#1230)

* Working on pose modification

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Support setting pose on links, visuals, collision via the GUI

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fix test

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>

* alphabetize

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Pimplize a class and added units, and 'joint'

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* remove laser

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added extra note

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Addressing comments

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Allow models to transform

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* remove console log

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* rename componentinspector in qml

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Update based on comments

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Don't publish ECM changes when paused

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Apply patch

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fix joint type dropdown

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Joint type spacing

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fix codecheck

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* editor changes

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Recereate on sensors

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Don't allow world as child link

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fix scene broadcaster test, and add another modelcommandapi test

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added model command api gpu lidar test

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* use MAX_VALUE

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added units to model command

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fix tests

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added ProcessNewWorldControlState test

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Update test/worlds/gpu_lidar.sdf

Co-authored-by: Louise Poubel <louise@openrobotics.org>

* Removed comments and plugins

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Update comments

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Ian Chen <ichen@osrfoundation.org>
Co-authored-by: Ashton Larkin <ashton@openrobotics.org>
Co-authored-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Michael Carroll <michael@openrobotics.org>
Co-authored-by: Louise Poubel <louise@openrobotics.org>
Co-authored-by: Ashton Larkin <42042756+adlarkin@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏯 fortress Ignition Fortress 🌱 garden Ignition Garden
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants