8000 ENH: Improve text for dicomwrapper errors in shape calculation by yarikoptic · Pull Request #1302 · nipy/nibabel · GitHub
[go: up one dir, main page]
Skip to content

ENH: Improve text for dicomwrapper errors in shape calculation #1302

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Feb 28, 2024
Merged

ENH: Improve text for dicomwrapper errors in shape calculation #1302

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7569219
Make "Calculated shape" more "correct" (do show shape) and informative
yarikoptic Feb 27, 2024
d063b95
STY: blue/flake8
effigies Feb 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions nibabel/nicom/dicomwrappers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,8 +565,12 @@ def image_shape(self):
ns_unique = [len(np.unique(row)) for row in self._frame_indices.T]
shape = (rows, cols) + tuple(ns_unique)
n_vols = np.prod(shape[3:])
if n_frames != n_vols * shape[2]:
raise WrapperError('Calculated shape does not match number of frames.')
n_frames_calc = n_vols * shape[2]
if n_frames != n_frames_calc:
raise WrapperError(
f'Calculated # of frames ({n_frames_calc}={n_vols}*{shape[2]}) '
f'of shape {shape} does not match NumberOfFrames {n_frames}.'
)
return tuple(shape)

@one_time
Expand Down
0