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

imviz matched zoom: use center & radius instead of corners #3215

Merged
merged 8 commits into from
Oct 17, 2024

Conversation

kecnry
Copy link
Member

@kecnry kecnry commented Oct 8, 2024

Description

This pull request fixes matched image box zoom when the matched viewers have different aspect ratios.'

TODO: this breaks the old tests that expect the same limits to be returned

Before:

Screen.Recording.2024-10-08.at.1.10.41.PM.mov

After:

Screen.Recording.2024-10-08.at.1.10.02.PM.mov

Change log entry

  • Is a change log needed? If yes, is it added to CHANGES.rst? If you want to avoid merge conflicts,
    list the proposed change log here for review and add to CHANGES.rst before merge. If no, maintainer
    should add a no-changelog-entry-needed label.

Checklist for package maintainer(s)

This checklist is meant to remind the package maintainer(s) who will review this pull request of some common things to look for. This list is not exhaustive.

  • Are two approvals required? Branch protection rule does not check for the second approval. If a second approval is not necessary, please apply the trivial label.
  • Do the proposed changes actually accomplish desired goals? Also manually run the affected example notebooks, if necessary.
  • Do the proposed changes follow the STScI Style Guides?
  • Are tests added/updated as required? If so, do they follow the STScI Style Guides?
  • Are docs added/updated as required? If so, do they follow the STScI Style Guides?
  • Did the CI pass? If not, are the failures related?
  • Is a milestone set? Set this to bugfix milestone if this is a bug fix and needs to be released ASAP; otherwise, set this to the next major release milestone. Bugfix milestone also needs an accompanying backport label.
  • After merge, any internal documentations need updating (e.g., JIRA, Innerspace)?

@kecnry kecnry added this to the 4.0 milestone Oct 8, 2024
@github-actions github-actions bot added imviz plugin Label for plugins common to multiple configurations labels Oct 8, 2024
Copy link
Contributor

@bmorris3 bmorris3 left a comment

Choose a reason for hiding this comment

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

This looks better! I will test on Rampviz later, just wanted to log that this implementation looks good to me.

@kecnry
Copy link
Member Author

kecnry commented Oct 9, 2024

Looks like there is still jittering in Rampviz with 3 viewers (but not with 2 viewers or Imviz with 3 viewers)... will continue to investigate and see if I can find a more general solution 🤞

@kecnry kecnry force-pushed the matched-zoom-aspect-ratio branch from 56e9a43 to 74e9ce9 Compare October 14, 2024 14:30
Copy link
Contributor

@bmorris3 bmorris3 left a comment

Choose a reason for hiding this comment

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

Woah! This looks a lot better now. There's still >1 zoom reset happening in the matched viewers, but it's happening really fast for me now.

Thank you!

@kecnry kecnry marked this pull request as ready for review October 14, 2024 16:17
@kecnry
Copy link
Member Author

kecnry commented Oct 14, 2024

Oh I forgot I still need to update tests 🤦‍♂️ I'll put in draft and work on that - glad to hear it seems to have fixed the use-case though!

@kecnry kecnry marked this pull request as draft October 14, 2024 18:15
@rosteen
Copy link
Collaborator

rosteen commented Oct 14, 2024

I also confirmed that it fixed the behavior I was seeing in Rampviz, I'll do a more thorough review once you update the tests.

@kecnry kecnry force-pushed the matched-zoom-aspect-ratio branch from c08dab4 to 3104c03 Compare October 17, 2024 12:59
@kecnry
Copy link
Member Author

kecnry commented Oct 17, 2024

Requires #3222 to pass remaining failing tests

Copy link
Contributor

@bmorris3 bmorris3 left a comment

Choose a reason for hiding this comment

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

Test revisions make sense. Thanks!

@kecnry kecnry force-pushed the matched-zoom-aspect-ratio branch from de20cac to 492a0dd Compare October 17, 2024 14:54
@kecnry kecnry marked this pull request as ready for review October 17, 2024 15:00
Copy link
Collaborator

@rosteen rosteen left a comment

Choose a reason for hiding this comment

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

Agreed, looks fine.

Copy link

codecov bot commented Oct 17, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 88.62%. Comparing base (0133d7d) to head (cca2396).
Report is 113 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #3215      +/-   ##
==========================================
+ Coverage   88.56%   88.62%   +0.05%     
==========================================
  Files         125      125              
  Lines       18758    18775      +17     
==========================================
+ Hits        16613    16639      +26     
+ Misses       2145     2136       -9     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@rosteen rosteen modified the milestones: 4.0, 4.1 Oct 17, 2024
@kecnry kecnry modified the milestones: 4.1, 4.0.1 Oct 17, 2024
@kecnry kecnry added the 💤backport-v4.0.x on-merge: backport to v4.0.x label Oct 17, 2024
@kecnry kecnry force-pushed the matched-zoom-aspect-ratio branch from 492a0dd to cca2396 Compare October 17, 2024 16:33
@kecnry kecnry merged commit 9a1fe09 into spacetelescope:main Oct 17, 2024
19 checks passed
meeseeksmachine pushed a commit to meeseeksmachine/jdaviz that referenced this pull request Oct 17, 2024
@kecnry kecnry deleted the matched-zoom-aspect-ratio branch October 17, 2024 18:01
kecnry added a commit that referenced this pull request Oct 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
imviz plugin Label for plugins common to multiple configurations 💤backport-v4.0.x on-merge: backport to v4.0.x
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants