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

[render] Deprecate CameraProperties and DepthCameraProperties #14376

Merged

Conversation

SeanCurtis-TRI
Copy link
Contributor

@SeanCurtis-TRI SeanCurtis-TRI commented Nov 20, 2020

This deprecates the old camera properties classes themselves. As part of that endeavor:

  • bindings deprecate the constructors.
  • A slew of deprecation warning suppressions everywhere.
    • In some cases, test cases were moved around to facilitate deprecation
      suppression en masse (see render_camera_test.cc)
  • Updated python tests to expect deprecation warnings.

Towards resolving checklist in #11880.

Closes #11880


This change is Reviewable

Copy link
Contributor Author

@SeanCurtis-TRI SeanCurtis-TRI left a comment

Choose a reason for hiding this comment

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

Ignore revision 1 - that's a snapshot of #14375. R2 is the real PR. I just wanted to get a jump on CI, making sure I haven't missed anything.

+@EricCousineau-TRI for the finishing touch, please. After #14375 merges, I'll rebase this back to a single commit.

Reviewable status: LGTM missing from assignee EricCousineau-TRI(platform), needs at least two assigned reviewers, commits need curation (https://drake.mit.edu/reviewable.html#curated-commits) (waiting on @EricCousineau-TRI)

Copy link
Contributor

@EricCousineau-TRI EricCousineau-TRI left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewed 12 of 12 files at r2.
Reviewable status: 1 unresolved discussion, needs at least two assigned reviewers, commits need curation (https://drake.mit.edu/reviewable.html#curated-commits) (waiting on @EricCousineau-TRI and @SeanCurtis-TRI)

a discussion (no related file):
Blocking pending merge of prerequisite PR



geometry/render/test/render_camera_test.cc, line 278 at r2 (raw file):

#pragma GCC diagnostic ignored "-Wdeprecated-declarations"

/* Test the converstion constructor. This will be removed when CameraProperties

BTW spelling "converstion"

Though meh; test code, and deprecated test code at that.

@SeanCurtis-TRI SeanCurtis-TRI force-pushed the PR_vtk_camera_intrinsics branch 2 times, most recently from bb1ea55 to 423595b Compare November 20, 2020 05:01
Copy link
Contributor Author

@SeanCurtis-TRI SeanCurtis-TRI left a comment

Choose a reason for hiding this comment

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

+(status: do not merge) (pending merge of prereq PR)

Reviewable status: 1 unresolved discussion, needs at least two assigned reviewers, labeled "do not merge", commits need curation (https://drake.mit.edu/reviewable.html#curated-commits) (waiting on @EricCousineau-TRI and @SeanCurtis-TRI)


geometry/render/test/render_camera_test.cc, line 278 at r2 (raw file):

Previously, EricCousineau-TRI (Eric Cousineau) wrote…

BTW spelling "converstion"

Though meh; test code, and deprecated test code at that.

Done; A typo so good, it's worth having three times.

@SeanCurtis-TRI SeanCurtis-TRI force-pushed the PR_vtk_camera_intrinsics branch 4 times, most recently from da4b572 to af19844 Compare November 20, 2020 21:31
Copy link
Contributor

@EricCousineau-TRI EricCousineau-TRI left a comment

Choose a reason for hiding this comment

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

Reviewable status: 1 unresolved discussion, needs at least two assigned reviewers, labeled "do not merge", commits need curation (https://drake.mit.edu/reviewable.html#curated-commits) (waiting on @EricCousineau-TRI and @SeanCurtis-TRI)

a discussion (no related file):

Previously, EricCousineau-TRI (Eric Cousineau) wrote…

Blocking pending merge of prerequisite PR

Given that prereq PR #14375 merged, is this almost ready to review?


Copy link
Contributor

@EricCousineau-TRI EricCousineau-TRI left a comment

Choose a reason for hiding this comment

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

Reviewable status: 1 unresolved discussion, needs at least two assigned reviewers, labeled "do not merge", commits need curation (https://drake.mit.edu/reviewable.html#curated-commits) (waiting on @EricCousineau-TRI and @SeanCurtis-TRI)

a discussion (no related file):

Previously, EricCousineau-TRI (Eric Cousineau) wrote…

Given that prereq PR #14375 merged, is this almost ready to review?

Correction: "ready to have review be finished"?


This deprecates the old camera properties classes themselves. As part of
that endeavor:

  - bindings deprecate the constructors.
  - A slew of deprecation warning suppressions everywhere.
    - In some cases, test cases were moved around to facilitate deprecation
      suppression en masse (see render_camera_test.cc)
  - Updated python tests to expect deprecation warnings.
@SeanCurtis-TRI SeanCurtis-TRI force-pushed the PR_vtk_camera_intrinsics branch from af19844 to 46bc33d Compare November 20, 2020 22:43
Copy link
Contributor Author

@SeanCurtis-TRI SeanCurtis-TRI left a comment

Choose a reason for hiding this comment

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

@EricCousineau-TRI Ready for finishing the review.

Reviewable status: 1 unresolved discussion, needs at least two assigned reviewers, labeled "do not merge" (waiting on @EricCousineau-TRI and @SeanCurtis-TRI)

Copy link
Contributor Author

@SeanCurtis-TRI SeanCurtis-TRI left a comment

Choose a reason for hiding this comment

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

Reviewable status: 1 unresolved discussion, needs at least two assigned reviewers, labeled "do not merge" (waiting on @EricCousineau-TRI)

a discussion (no related file):

Previously, EricCousineau-TRI (Eric Cousineau) wrote…

Correction: "ready to have review be finished"?

We can close this; we're officially rebased to a single commit.


Copy link
Contributor Author

@SeanCurtis-TRI SeanCurtis-TRI left a comment

Choose a reason for hiding this comment

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

-(status: do not merge)

Reviewable status: 1 unresolved discussion, needs at least two assigned reviewers, labeled "do not merge" (waiting on @EricCousineau-TRI)

Copy link
Contributor Author

@SeanCurtis-TRI SeanCurtis-TRI left a comment

Choose a reason for hiding this comment

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

+@sherm1 for simultaneous platform review, maybe?

Reviewable status: 1 unresolved discussion, LGTM missing from assignee sherm1(platform) (waiting on @EricCousineau-TRI and @sherm1)

Copy link
Member

@sherm1 sherm1 left a comment

Choose a reason for hiding this comment

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

Reviewing now ...

Reviewable status: 1 unresolved discussion, LGTM missing from assignee sherm1(platform) (waiting on @EricCousineau-TRI and @sherm1)

Copy link
Member

@sherm1 sherm1 left a comment

Choose a reason for hiding this comment

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

Platform :lgtm_strong: -- great to see #11880 put to bed! It will also be a huge relief a few months from now when we can delete all the deprecated code and uses of deprecated code.

Will there be some Anzu suffering to go with this?

Reviewed 11 of 12 files at r2, 8 of 10 files at r3.
Dismissed @EricCousineau-TRI from a discussion.
Reviewable status: :shipit: complete! all discussions resolved, LGTM from assignees EricCousineau-TRI(platform),sherm1(platform)

@sherm1 sherm1 merged commit e5f3c3e into RobotLocomotion:master Nov 21, 2020
@SeanCurtis-TRI
Copy link
Contributor Author

I believe there will be some; I hope @EricCousineau-TRI will be willing to help suppress the deprecation warnings.

@EricCousineau-TRI
Copy link
Contributor

EricCousineau-TRI commented Nov 21, 2020

Yup, can do!

FTR I like more active requests than passive requests that make my ears burn ;)

EDIT: See Anzu issue 6027 and PR 6026

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

camera_properties: Support setting with intrinsic matrix, possibly using CameraInfo
3 participants