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

Added Camera Info topic support for cameras #285

Merged
merged 6 commits into from
Feb 15, 2023

Conversation

ahcorde
Copy link
Contributor

@ahcorde ahcorde commented Nov 11, 2022

Signed-off-by: ahcorde [email protected]

🎉 New feature

Summary

Related with gazebosim/sdformat#1198

Added Camera Info topic support for cameras

Test it

Checklist

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

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

@ahcorde ahcorde self-assigned this Nov 11, 2022
@github-actions github-actions bot added the 🌱 garden Ignition Garden label Nov 11, 2022
@ahcorde ahcorde added the needs upstream release Blocked by a release of an upstream library label Nov 11, 2022
src/Camera_TEST.cc Outdated Show resolved Hide resolved
src/Camera_TEST.cc Outdated Show resolved Hide resolved
@ahcorde ahcorde changed the base branch from gz-sensors7 to ign-sensors3 November 14, 2022 08:23
@ahcorde ahcorde requested a review from iche033 November 14, 2022 08:25
@iche033
Copy link
Contributor

iche033 commented Nov 16, 2022

hmm I'm seeing a change in behavior in terms of default camera info topic names with this change.

I tried commenting out this <topic> line in sensors_demo.sdf here:
https://github.com/gazebosim/gz-sim/blob/gz-sim7/examples/worlds/sensors_demo.sdf#L327

before this change, I see these relevant topics

/camera_info
...
/world/lidar_sensor/model/cameras_alone/link/link/sensor/cameras_alone/camera_info
/world/lidar_sensor/model/cameras_alone/link/link/sensor/cameras_alone/image

after this change, I get

/camera_info
...
/world/lidar_sensor/model/cameras_alone/link/link/sensor/cameras_alone/image

I think that's because the camera_info element has a default value of camera_info
https://github.com/gazebosim/sdformat/blob/0afa966023d8b619b66777ef8f4620de7a4416d8/sdf/1.7/camera.sdf#L8

So in gz-sensors, the topic will always be set to camera_info

How about changing the default camera_info sdf element value to "" in sdformat? https://github.com/gazebosim/sdformat/blob/0afa966023d8b619b66777ef8f4620de7a4416d8/sdf/1.7/camera.sdf#L8

Signed-off-by: ahcorde <[email protected]>
Signed-off-by: Alejandro Hernández Cordero <[email protected]>
@iche033
Copy link
Contributor

iche033 commented Nov 17, 2022

changes look good to me now. Needs an sdformat9 release

@ahcorde
Copy link
Contributor Author

ahcorde commented Nov 18, 2022

@osrf-jenkins run tests please!

@iche033 iche033 added 🏰 citadel Ignition Citadel and removed 🌱 garden Ignition Garden labels Feb 15, 2023
@codecov
Copy link

codecov bot commented Feb 15, 2023

Codecov Report

Merging #285 (430ea9a) into ign-sensors3 (425359e) will decrease coverage by 0.02%.
The diff coverage is 88.88%.

❗ Current head 430ea9a differs from pull request most recent head 6a0214c. Consider uploading reports for the commit 6a0214c to get more accurate results

@@               Coverage Diff                @@
##           ign-sensors3     #285      +/-   ##
================================================
- Coverage         79.80%   79.78%   -0.02%     
================================================
  Files                23       23              
  Lines              2377     2380       +3     
================================================
+ Hits               1897     1899       +2     
- Misses              480      481       +1     
Impacted Files Coverage Δ
src/CameraSensor.cc 75.27% <88.88%> (-0.10%) ⬇️

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

@iche033 iche033 merged commit 898570d into ign-sensors3 Feb 15, 2023
@iche033 iche033 deleted the ahcorde/3/camera_info branch February 15, 2023 22:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏰 citadel Ignition Citadel needs upstream release Blocked by a release of an upstream library
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants