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

Together #1187

Merged
merged 45 commits into from
Nov 11, 2021
Merged

Together #1187

merged 45 commits into from
Nov 11, 2021

Conversation

nkoenig
Copy link
Contributor

@nkoenig nkoenig commented Nov 10, 2021

This is part of the ModelEditor work, where I'm trying to get the recreation functionality to work. Mostly looking for some assistance.

Here is how I'm currently testing:

  1. ign gazebo -v 4 sensors.sdf
  2. Add a new link to the sensors_box model using the GUI.
  3. Click Step on the GUI.
  4. You will see the following console output
Adding entity for recreation[8]
[Wrn] [Physics.cc:1102] Collision's parent entity [1073741824] not found on link map.
[Err] [Physics.cc:2365] Internal error: entity [1073741824] not in entity map
[Dbg] [EntityComponentManager.cc:1540] Updated state thread iterators: 16 threads processing around 2 entities each.
Cloning entity[8] Name[sensors_box]
Cloning entity[9] Name[link]
Cloning entity[10] Name[visual]
Cloning entity[11] Name[collision]
Cloning entity[12] Name[altimeter]
Cloning entity[13] Name[air_pressure]
Cloning entity[14] Name[imu]
Cloning entity[15] Name[magnetometer]
Cloning entity[1073741824] Name[link_1]
Cloning entity[1073741825] Name[visual]
Cloning entity[1073741826] Name[collision]
Removing recreate component from entity[17]
Adding entity for recreation[17]
  1. I'm ignoring the Physics system error for right now. I'm trying to understand why removing the Recreate component from the newly create entity (17 in this case) still causes the View in SimulationRunner::ProcessRecreateEntitiesRemove to think the Recreate component exists.

There are some debug statements that need to be removed once the issues are resolved.

Note to maintainers: Remember to use Squash-Merge

iche033 and others added 30 commits October 6, 2021 17:50
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Nate Koenig <[email protected]>

Co-authored-by: Nate Koenig <[email protected]>
* use entity instead of entity name

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

* Update link add menu

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

Co-authored-by: Nate Koenig <[email protected]>
Co-authored-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Nate Koenig <[email protected]>
@codecov
Copy link

codecov bot commented Nov 10, 2021

Codecov Report

Merging #1187 (e312919) into recreate_entities (370ffd2) will decrease coverage by 0.00%.
The diff coverage is 60.00%.

❗ Current head e312919 differs from pull request most recent head 10b85e1. Consider uploading reports for the commit 10b85e1 to get more accurate results
Impacted file tree graph

@@                  Coverage Diff                  @@
##           recreate_entities    #1187      +/-   ##
=====================================================
- Coverage              61.36%   61.35%   -0.01%     
=====================================================
  Files                    262      262              
  Lines                  20870    20900      +30     
=====================================================
+ Hits                   12807    12824      +17     
- Misses                  8063     8076      +13     
Impacted Files Coverage Δ
src/SimulationRunner.hh 100.00% <ø> (ø)
src/gui/plugins/component_inspector/ModelEditor.cc 7.40% <0.00%> (-0.06%) ⬇️
src/systems/physics/Physics.cc 70.61% <50.00%> (-0.22%) ⬇️
src/SimulationRunner.cc 92.90% <57.14%> (-0.94%) ⬇️
include/ignition/gazebo/detail/View.hh 100.00% <100.00%> (ø)
src/EntityComponentManager.cc 87.39% <100.00%> (+0.04%) ⬆️

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 370ffd2...10b85e1. Read the comment docs.

@iche033
Copy link
Contributor

iche033 commented Nov 10, 2021

I can reproduce the issue that the recreate component is not removed. Looking into it.

@nkoenig
Copy link
Contributor Author

nkoenig commented Nov 10, 2021

I believe the issue is that the cloned entity is added to the view's toAddEntities list, and is not removed from this list by the View::NotifyComponentRemoval function.

Signed-off-by: Ian Chen <[email protected]>
@iche033
Copy link
Contributor

iche033 commented Nov 11, 2021

I pushed a change that works around the issue mainly by using EachNoCache here when looping through entities with Recreate component. Ign-gazebo still crash in the physics system when it is stepped though. I'll continue looking at how to properly remove components from views first

@iche033
Copy link
Contributor

iche033 commented Nov 11, 2021

I'll continue looking at how to properly remove components from views first

e312919 should do it. Also updated test to verify that the Recreate components are removed

The physics system crash still exists.

@chapulina chapulina added editor Tools to edit entities in simulation GUI Gazebo's graphical interface (not pure Ignition GUI) 🏯 fortress Ignition Fortress labels Nov 11, 2021
@nkoenig
Copy link
Contributor Author

nkoenig commented Nov 11, 2021

Thanks. I'm getting closer on the physics crash.

Signed-off-by: Nate Koenig <[email protected]>
@nkoenig
Copy link
Contributor Author

nkoenig commented Nov 11, 2021

I believe physics is fixed in 199dafe

@nkoenig
Copy link
Contributor Author

nkoenig commented Nov 11, 2021

This also behaves well when adding links to models with sensors.

Signed-off-by: Nate Koenig <[email protected]>
@nkoenig
Copy link
Contributor Author

nkoenig commented Nov 11, 2021

I'll go ahead and merge this in the recreate_entities branch.

@nkoenig nkoenig merged commit 304d004 into recreate_entities Nov 11, 2021
@nkoenig nkoenig deleted the together branch November 11, 2021 20:55
nkoenig added a commit that referenced this pull request Nov 17, 2021
* add recreate component and implement recreate entities functionality, add test

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

* update test and make recreate entities with same name work

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

* revert add include

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

* style

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

* Support editing air pressure sensor in the GUI

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

* Add noise to qrc

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

* Add noise to qrc

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

* Fix lint

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

* Update sensor icon

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

* Move AirPressure functions out of ComponentInspector (#1179)

Signed-off-by: Louise Poubel <[email protected]>

* Fix get decimals, and address comments

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

* cleanup and simplification

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

* check recreate comp in ancestor

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

* require sdf 12.1.0

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

* Revert sdf version requirement

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

* Fix codecheck

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

* revert my bad merge

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

* remvoe sensor icon

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

* Together (#1187)

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

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

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

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

* write to ECM

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

* support adding light links

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

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

Signed-off-by: Ashton Larkin <[email protected]>

* use const ref for constructor input params

Signed-off-by: Ashton Larkin <[email protected]>

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

Signed-off-by: Ashton Larkin <[email protected]>

* testing makr as new entity  func

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

* rm printouts

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

* register type

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

* refactor render util

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

* workaround for avoiding crash on exit

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

* refactor, comment out unused menu items

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

* remove commented out code, add CreateLight function

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

* add model editor src files

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

* remove more commented out code

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

* use entity instead of entity name (#1176)

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

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

* Add link menu updates (#1177)

* use entity instead of entity name

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

* Update link add menu

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

Co-authored-by: Nate Koenig <[email protected]>
Co-authored-by: Ian Chen <[email protected]>

* fix adding ellipsoid

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

* merge model_editor into component_inspector

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

* fixing warnings

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

* Adjust tool tips

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

* fix adding light

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

* Fix codecheck

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

* Fixed documentation

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

* Working on model creation

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

* Fix build

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

* Added debug statements

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

* use each no cache

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

* fix removing component from view

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

* Fix physics

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

* Fix codecheck

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

Co-authored-by: Ian Chen <[email protected]>
Co-authored-by: Ashton Larkin <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>

* Address comments

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

* update cameras list on sensor removal

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

* update cameras list on sensor removal

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

* Require sensors 6.1

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

* sensors 6.0.1

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

* Test model recreation with jointed models

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

* 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 <[email protected]>

* 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 <[email protected]>

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

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

* Added test for world joints

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

Co-authored-by: Nate Koenig <[email protected]>
Co-authored-by: Michael Carroll <[email protected]>
Co-authored-by: Louise Poubel <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>
Co-authored-by: Ashton Larkin <[email protected]>
@nkoenig nkoenig mentioned this pull request Dec 3, 2021
8 tasks
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 <[email protected]>

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

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

* write to ECM

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

* support adding light links

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

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

Signed-off-by: Ashton Larkin <[email protected]>

* use const ref for constructor input params

Signed-off-by: Ashton Larkin <[email protected]>

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

Signed-off-by: Ashton Larkin <[email protected]>

* testing makr as new entity  func

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

* rm printouts

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

* register type

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

* refactor render util

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

* workaround for avoiding crash on exit

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

* refactor, comment out unused menu items

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

* remove commented out code, add CreateLight function

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

* add model editor src files

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

* remove more commented out code

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

* use entity instead of entity name (#1176)

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

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

* Add link menu updates (#1177)

* use entity instead of entity name

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

* Update link add menu

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

Co-authored-by: Nate Koenig <[email protected]>
Co-authored-by: Ian Chen <[email protected]>

* fix adding ellipsoid

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

* merge model_editor into component_inspector

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

* fixing warnings

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

* Adjust tool tips

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

* fix adding light

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

* Fix codecheck

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

* Fixed documentation

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

Co-authored-by: Ashton Larkin <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>

* Support recreating model entities (#1170)

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

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

* update test and make recreate entities with same name work

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

* revert add include

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

* style

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

* Support editing air pressure sensor in the GUI

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

* Add noise to qrc

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

* Add noise to qrc

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

* Fix lint

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

* Update sensor icon

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

* Move AirPressure functions out of ComponentInspector (#1179)

Signed-off-by: Louise Poubel <[email protected]>

* Fix get decimals, and address comments

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

* cleanup and simplification

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

* check recreate comp in ancestor

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

* require sdf 12.1.0

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

* Revert sdf version requirement

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

* Fix codecheck

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

* revert my bad merge

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

* remvoe sensor icon

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

* Together (#1187)

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

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

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

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

* write to ECM

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

* support adding light links

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

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

Signed-off-by: Ashton Larkin <[email protected]>

* use const ref for constructor input params

Signed-off-by: Ashton Larkin <[email protected]>

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

Signed-off-by: Ashton Larkin <[email protected]>

* testing makr as new entity  func

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

* rm printouts

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

* register type

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

* refactor render util

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

* workaround for avoiding crash on exit

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

* refactor, comment out unused menu items

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

* remove commented out code, add CreateLight function

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

* add model editor src files

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

* remove more commented out code

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

* use entity instead of entity name (#1176)

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

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

* Add link menu updates (#1177)

* use entity instead of entity name

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

* Update link add menu

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

Co-authored-by: Nate Koenig <[email protected]>
Co-authored-by: Ian Chen <[email protected]>

* fix adding ellipsoid

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

* merge model_editor into component_inspector

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

* fixing warnings

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

* Adjust tool tips

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

* fix adding light

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

* Fix codecheck

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

* Fixed documentation

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

* Working on model creation

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

* Fix build

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

* Added debug statements

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

* use each no cache

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

* fix removing component from view

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

* Fix physics

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

* Fix codecheck

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

Co-authored-by: Ian Chen <[email protected]>
Co-authored-by: Ashton Larkin <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>

* Address comments

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

* update cameras list on sensor removal

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

* update cameras list on sensor removal

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

* Require sensors 6.1

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

* sensors 6.0.1

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

* Test model recreation with jointed models

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

* 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 <[email protected]>

* 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 <[email protected]>

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

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

* Added test for world joints

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

Co-authored-by: Nate Koenig <[email protected]>
Co-authored-by: Michael Carroll <[email protected]>
Co-authored-by: Louise Poubel <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>
Co-authored-by: Ashton Larkin <[email protected]>

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

* Support editing air pressure sensor in the GUI

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

* Add noise to qrc

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

* Add noise to qrc

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

* Fix lint

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

* Update sensor icon

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

* Move AirPressure functions out of ComponentInspector (#1179)

Signed-off-by: Louise Poubel <[email protected]>

* Fix get decimals, and address comments

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

* cleanup and simplification

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

* Require sdf 12.1.0

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

* missign width

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

* Added simulation state aware spin box

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

* Remove console output

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

* Added state awareness to add entity button

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

* Fix codecheck

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

* Remove extra variable

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

Co-authored-by: Nate Koenig <[email protected]>
Co-authored-by: Michael Carroll <[email protected]>
Co-authored-by: Louise Poubel <[email protected]>

* Added altimeter sensor inspector (#1172)

* Support editing air pressure sensor in the GUI

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

* Add noise to qrc

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

* Add noise to qrc

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

* Added altimeter sensor inspector

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

* Fix lint

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

* Update sensor icon

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

* Move AirPressure functions out of ComponentInspector (#1179)

Signed-off-by: Louise Poubel <[email protected]>

* Fix get decimals, and address comments

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

* cleanup and simplification

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

* Require sdf 12.1.0

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

* missign width

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

* Added simulation state aware spin box

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

* Merged

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

* merged

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

* Remove console output

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

* alphabetize

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

* Documentation

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

Co-authored-by: Nate Koenig <[email protected]>
Co-authored-by: Michael Carroll <[email protected]>
Co-authored-by: Louise Poubel <[email protected]>

* Added magnetometer inspector (#1173)

* Support editing air pressure sensor in the GUI

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

* Add noise to qrc

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

* Add noise to qrc

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

* Added altimeter sensor inspector

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

* Added magnetometer inspector

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

* Fix lint

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

* Update sensor icon

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

* Move AirPressure functions out of ComponentInspector (#1179)

Signed-off-by: Louise Poubel <[email protected]>

* Fix get decimals, and address comments

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

* cleanup and simplification

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

* Require sdf 12.1.0

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

* missign width

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

* Added simulation state aware spin box

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

* Merged

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

* merged

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

* Remove console output

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

* alphabetize

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

* Fix build

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

* alphabetize

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

* Cleanup build

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

* Missing print call

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

Co-authored-by: Nate Koenig <[email protected]>
Co-authored-by: Michael Carroll <[email protected]>
Co-authored-by: Louise Poubel <[email protected]>

* Add IMU component inspector (#1191)

* Support editing air pressure sensor in the GUI

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

* Add noise to qrc

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

* Add noise to qrc

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

* Added altimeter sensor inspector

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

* Added magnetometer inspector

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

* Fix lint

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

* Update sensor icon

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

* Move AirPressure functions out of ComponentInspector (#1179)

Signed-off-by: Louise Poubel <[email protected]>

* Fix get decimals, and address comments

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

* cleanup and simplification

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

* Require sdf 12.1.0

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

* missign width

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

* Added simulation state aware spin box

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

* Merged

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

* merged

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

* Remove console output

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

* alphabetize

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

* Fix build

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

* Add IMU component inspector

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

* alphabetize

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

* Cleanup build

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

* Missing print call

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

* Fix all codecheck issues

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

Co-authored-by: Nate Koenig <[email protected]>
Co-authored-by: Michael Carroll <[email protected]>
Co-authored-by: Louise Poubel <[email protected]>

* Added lidar component inspector (#1203)

* Support editing air pressure sensor in the GUI

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

* Add noise to qrc

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

* Add noise to qrc

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

* Added altimeter sensor inspector

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

* Added magnetometer inspector

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

* Fix lint

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

* Update sensor icon

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

* Move AirPressure functions out of ComponentInspector (#1179)

Signed-off-by: Louise Poubel <[email protected]>

* Fix get decimals, and address comments

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

* cleanup and simplification

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

* Require sdf 12.1.0

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

* missign width

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

* Added simulation state aware spin box

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

* Merged

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

* merged

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

* Remove console output

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

* alphabetize

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

* Fix build

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

* Add IMU component inspector

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

* Added lidar component inspector

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

* Fix codecheck

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

Co-authored-by: Nate Koenig <[email protected]>
Co-authored-by: Michael Carroll <[email protected]>
Co-authored-by: Louise Poubel <[email protected]>

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

* Model Editor: Add Joints to model

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

* Lint

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

* Style and documentation

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

* Suppress physics warnings on newly-created joints

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

* Added a header

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

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

* Allow user to modify joint type (#1198)

* Support editing air pressure sensor in the GUI

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

* Add noise to qrc

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

* Add noise to qrc

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

* Fix lint

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

* Update sensor icon

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

* Move AirPressure functions out of ComponentInspector (#1179)

Signed-off-by: Louise Poubel <[email protected]>

* Fix get decimals, and address comments

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

* cleanup and simplification

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

* Require sdf 12.1.0

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

* missign width

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

* Added simulation state aware spin box

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

* Remove console output

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

* Allow user to modify joint type

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

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

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

* Added recreate to joint add

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

Co-authored-by: Nate Koenig <[email protected]>
Co-authored-by: Louise Poubel <[email protected]>

* 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 <[email protected]>

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

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

* write to ECM

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

* get updated GUI ECM info in world control CB

Signed-off-by: Ashton Larkin <[email protected]>

* support adding light links

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

* working on adding tests

Signed-off-by: Ashton Larkin <[email protected]>

* remove TODO note, issue fixed by #1131

Signed-off-by: Ashton Larkin <[email protected]>

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

Signed-off-by: Ashton Larkin <[email protected]>

* use const ref for constructor input params

Signed-off-by: Ashton Larkin <[email protected]>

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

Signed-off-by: Ashton Larkin <[email protected]>

* testing makr as new entity  func

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

* rm printouts

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

* register type

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

* refactor render util

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

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

Signed-off-by: Ashton Larkin <[email protected]>

* use gui event to update server

Signed-off-by: Ashton Larkin <[email protected]>

* Working on sensor addition and editing

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

* handle step and support original control service

Signed-off-by: Ashton Larkin <[email protected]>

* Reduced code duplication

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

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

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

* Testing things out

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

* updates

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

* workaround for avoiding crash on exit

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

* refactor, comment out unused menu items

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

* remove commented out code, add CreateLight function

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

* add model editor src files

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

* remove more commented out code

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

* Fix build

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

* use entity instead of entity name

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

* Update link add menu

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

* Updates

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

* Added back in sensor menu

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

* Updates

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

* Updates

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

* Updates

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

* use entity instead of entity name (#1176)

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

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

* Adding sensors

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

* Add link menu updates (#1177)

* use entity instead of entity name

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

* Update link add menu

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

Co-authored-by: Nate Koenig <[email protected]>
Co-authored-by: Ian Chen <[email protected]>

* fix adding ellipsoid

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

* merge model_editor into component_inspector

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

* fixing warnings

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

* Adjust tool tips

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

* Updates

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

* updates

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

* updates

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

* Adding lidar menu

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

* alphabetize

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

* Comment out sensors not supported

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

* Added segmentation camera

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

* fix id

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

* fix codecheck

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

* Fix submenue

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

* Remove lidar menu, and address comments

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

* fix codecheck

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

* Merged

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

Co-authored-by: Ian Chen <[email protected]>
Co-authored-by: Ashton Larkin <[email protected]>
Co-authored-by: Ashton Larkin <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>

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

* Working on pose modification

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

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

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

* Fix test

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

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

* alphabetize

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

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

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

* remove laser

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

* Added extra note

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

* Addressing comments

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

* Allow models to transform

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

* remove console log

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

* rename componentinspector in qml

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

* Update based on comments

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

* Don't publish ECM changes when paused

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

* Apply patch

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

* Fix joint type dropdown

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

* Joint type spacing

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

* Fix codecheck

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

* editor changes

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

* Recereate on sensors

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

* Don't allow world as child link

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

* Fix scene broadcaster test, and add another modelcommandapi test

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

* Added model command api gpu lidar test

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

* use MAX_VALUE

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

* Added units to model command

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

* Fix tests

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

* Added ProcessNewWorldControlState test

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

* Update test/worlds/gpu_lidar.sdf

Co-authored-by: Louise Poubel <[email protected]>

* Removed comments and plugins

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

* Update comments

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

Co-authored-by: Ian Chen <[email protected]>
Co-authored-by: Ashton Larkin <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>
Co-authored-by: Michael Carroll <[email protected]>
Co-authored-by: Louise Poubel <[email protected]>
Co-authored-by: Ashton Larkin <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
editor Tools to edit entities in simulation 🏯 fortress Ignition Fortress GUI Gazebo's graphical interface (not pure Ignition GUI)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants