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

Model editor #1231

Merged
merged 44 commits into from
Dec 10, 2021
Merged

Model editor #1231

merged 44 commits into from
Dec 10, 2021

Conversation

nkoenig
Copy link
Contributor

@nkoenig nkoenig commented Dec 3, 2021

🎉 New feature

Summary

This pushes the model editor improvements into Fortress. The changes/improvements include:

  1. Addition of a "plus" button on the entity tree which supports model and light insertion.
  2. Addition of an entity-aware "plus" button on the component inspector. This supports addition of links, joints, and light to a selected model. Sensors can be added to links.
  3. Most sensor properties can be edited from the component inspector.
  4. Editing of model, link, collision, visual poses is supported in the component inspector.
  5. Edit boxes are simulation-state aware, and should be enabled when simulation is paused.
  6. Changes are sent to the server when play or step is pressed.

Test it

  1. Open and empty world or a world like shapes.sdf
  2. Use the tools to make edits.
  3. You can also open another gui instance ign gazebo -v 4 -g. Changes in this instance should be reflected when play/step is pressed in the first GUI instance.
  4. Saving the world should also include your changes, assuming you have stepped or played simulation after making an edit.

Checklist

  • Signed all commits for DCO
  • Added tests
  • Added example and/or tutorial
  • 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

iche033 and others added 15 commits November 10, 2021 09:43
* 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]>
* 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

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]>
* 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]>
* 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]>
* 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]>
* 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

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]>
* 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]>
Signed-off-by: Nate Koenig <[email protected]>
* 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]>
* 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]>
Signed-off-by: Nate Koenig <[email protected]>
@github-actions github-actions bot added the 🏯 fortress Ignition Fortress label Dec 3, 2021
@chapulina chapulina added editor Tools to edit entities in simulation GUI Gazebo's graphical interface (not pure Ignition GUI) labels Dec 3, 2021
@codecov
Copy link

codecov bot commented Dec 3, 2021

Codecov Report

Merging #1231 (0734a60) into ign-gazebo6 (17f63c4) will decrease coverage by 0.03%.
The diff coverage is 44.51%.

Impacted file tree graph

@@               Coverage Diff               @@
##           ign-gazebo6    #1231      +/-   ##
===============================================
- Coverage        62.26%   62.22%   -0.04%     
===============================================
  Files              275      276       +1     
  Lines            22713    22886     +173     
===============================================
+ Hits             14142    14241      +99     
- Misses            8571     8645      +74     
Impacted Files Coverage Δ
include/ignition/gazebo/SdfEntityCreator.hh 100.00% <ø> (ø)
...nclude/ignition/gazebo/components/Serialization.hh 95.55% <ø> (ø)
include/ignition/gazebo/gui/GuiEvents.hh 0.00% <ø> (ø)
include/ignition/gazebo/rendering/RenderUtil.hh 100.00% <ø> (ø)
src/SimulationRunner.hh 100.00% <ø> (ø)
src/cmd/ModelCommandAPI.cc 0.00% <0.00%> (ø)
src/gui/GuiEvents.cc 57.14% <0.00%> (-42.86%) ⬇️
src/gui/plugins/entity_tree/EntityTree.cc 8.13% <0.00%> (+0.06%) ⬆️
src/gui/plugins/entity_tree/EntityTree.hh 100.00% <ø> (ø)
src/systems/sensors/Sensors.cc 68.75% <0.00%> (-1.17%) ⬇️
... and 11 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 17f63c4...0734a60. Read the comment docs.

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.

I've only reviewed 15/71 files so far, publishing the review so comments can be addressed while I review the rest.

I found a couple of usability issues:

  1. Added link isn't affected by physics

adding_box_link

  1. Visualizations don't work for added link:

added_link

examples/worlds/sensors.sdf Outdated Show resolved Hide resolved
include/ignition/gazebo/gui/GuiEvents.hh Outdated Show resolved Hide resolved
include/ignition/gazebo/gui/GuiEvents.hh Outdated Show resolved Hide resolved
include/ignition/gazebo/detail/View.hh Show resolved Hide resolved
src/cmd/ModelCommandAPI.cc Show resolved Hide resolved
src/cmd/ModelCommandAPI.cc Show resolved Hide resolved
src/gui/plugins/component_inspector/ComponentInspector.qml Outdated Show resolved Hide resolved
id: stateAwareSpinContentLoader
width: parent.width
Layout.fillWidth: true
sourceComponent: componentInspector.getSimPaused() ? writableNumber : readOnlyNumber
Copy link
Contributor

Choose a reason for hiding this comment

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

Model poses aren't editable anymore while running the simulation. That's a regression.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed in 55f4703

Copy link
Contributor

Choose a reason for hiding this comment

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

It's editable now, but it doesn't work

editmodelpose

src/gui/plugins/component_inspector/ComponentInspector.cc Outdated Show resolved Hide resolved
@mjcarroll
Copy link
Contributor

Added link isn't affected by physics

I believe that is because you are modifying the link pose within the model. If I add a link next to the existing one (at say x+1) and drop the entire model, it works as expected.

@nkoenig nkoenig mentioned this pull request Dec 3, 2021
9 tasks
Signed-off-by: Nate Koenig <[email protected]>
Signed-off-by: Nate Koenig <[email protected]>
@nkoenig
Copy link
Contributor Author

nkoenig commented Dec 7, 2021

  1. Add only a sensor to a model and hit play -> the model is not recreated.

Fixed in 1b3798f

@nkoenig
Copy link
Contributor Author

nkoenig commented Dec 8, 2021

  1. Add a joint to the box model in shapes.sdf, and set the Parent Link to be box_link and hit play -> error msg is printed:
    [Err] [EntityComponentManager.cc:558] The cloned joint entity [33] was unable to find the original joint entity's parent and/or child link.
    
    • if I set the Child Link of the joint (instead of Parent Link) to box_link, it works as expected.

Modified to disallow world as a child link in b5f3778

@iche033
Copy link
Contributor

iche033 commented Dec 8, 2021

confirmed that recent changes fixed the 2 issues found in #1231 (review).

test/worlds/gpu_lidar.sdf Outdated Show resolved Hide resolved
test/worlds/gpu_lidar.sdf Outdated Show resolved Hide resolved
test/worlds/gpu_lidar.sdf Outdated Show resolved Hide resolved
Copy link
Contributor

@mjcarroll mjcarroll left a comment

Choose a reason for hiding this comment

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

I have been exercising the combined component_inspector_editor functionality today and haven't found anything that would cause any concern.

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.

5 participants