-
Notifications
You must be signed in to change notification settings - Fork 627
Fix IndexError when loading image with auto-adjust saturation unchecked #1453
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
Open
chenyenchung
wants to merge
3
commits into
MouseLand:main
Choose a base branch
from
chenyenchung:always-initialize-sat
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+78
−3
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. These tests seem a bit fragile but we can keep them if they pass the GH workflow. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| import numpy as np | ||
| import pytest | ||
|
|
||
|
|
||
| @pytest.fixture(scope="module") | ||
| def qapp(): | ||
| from qtpy.QtWidgets import QApplication | ||
| app = QApplication.instance() or QApplication([]) | ||
| yield app | ||
|
|
||
|
|
||
| @pytest.fixture(scope="module") | ||
| def win(qapp): | ||
| from cellpose.gui.gui3d import MainW_3d | ||
| return MainW_3d() | ||
|
|
||
|
|
||
| @pytest.mark.slow | ||
| def test_saturation_invariants_with_autobtn_unchecked(win): | ||
| """Regression: when 'auto-adjust saturation' is unchecked, loading a 3D | ||
| image must (1) leave self.saturation sized 3 x NZ so that update_plot's | ||
| self.saturation[c][currentZ] index is valid, and (2) preserve the user's | ||
| per-channel values across reloads that change NZ.""" | ||
| from cellpose.gui import io as gui_io | ||
|
|
||
| win.autobtn.setChecked(False) | ||
|
|
||
| # First load: NZ=10, saturation must be 3 x 10 with valid [lo, hi] entries. | ||
| win.load_3D = True | ||
| win.filename = "test.tif" | ||
| gui_io._initialize_images( | ||
| win, np.zeros((10, 64, 64, 3), dtype=np.float32), load_3D=True | ||
| ) | ||
|
|
||
| assert win.NZ == 10 | ||
| assert len(win.saturation) == 3 | ||
| for c in range(3): | ||
| assert len(win.saturation[c]) == win.NZ | ||
| for z in range(win.NZ): | ||
| assert len(win.saturation[c][z]) == 2 # [lo, hi] | ||
|
|
||
| # Trigger the original failure path explicitly: move_in_Z -> update_plot | ||
| # -> setLevels(self.saturation[self.color - 1][self.currentZ]). | ||
| win.loaded = True | ||
| win.color = 1 # red channel (color > 0 and < 4 branch) | ||
| win.nchan = 3 | ||
| win.scroll.setValue(win.NZ - 1) | ||
| win.move_in_Z() # would have raised IndexError pre-fix | ||
|
|
||
| # User picks custom per-channel values. | ||
| for c in range(3): | ||
| for z in range(win.NZ): | ||
| win.saturation[c][z] = [10 + c, 200 + c] | ||
|
|
||
| # Reload with a different NZ; user values should be broadcast across new Z. | ||
| gui_io._initialize_images( | ||
| win, np.zeros((8, 64, 64, 3), dtype=np.float32), load_3D=True | ||
| ) | ||
|
|
||
| assert win.NZ == 8 | ||
| for c in range(3): | ||
| assert len(win.saturation[c]) == win.NZ | ||
| for z in range(win.NZ): | ||
| assert win.saturation[c][z] == [10 + c, 200 + c] |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
helpful, thanks