Skip to content

Fix HDF5 cropped reader #462

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 9 commits into from
Jul 3, 2025
Merged

Fix HDF5 cropped reader #462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
66d12ba
Add brackets
DanicaSTFC Feb 26, 2025
215f69b
Merge branch 'master' into fix-cilHDF5CroppedReader
DanicaSTFC Feb 26, 2025
70a8d72
Delete print
DanicaSTFC Feb 26, 2025
736ad2c
Fix dimensions
DanicaSTFC Feb 26, 2025
02bc69c
Automated autoyapf fixes
invalid-email-address Feb 26, 2025
4b47cd9
edit changelog
DanicaSTFC Feb 26, 2025
ecd8706
Merge branch 'fix-cilHDF5CroppedReader' of github.com:TomographicImag…
DanicaSTFC Feb 27, 2025
9b440f9
Merge branch 'master' of github.com:TomographicImaging/CILViewer into…
DanicaSTFC Jul 3, 2025
9a89c8c
fix merging of changelog
DanicaSTFC Jul 3, 2025
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
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Enhancements:
- Standalone viewer uses `SaveableRawInputDialog` - this allows user to save and reload settings for loading raw data #444

Bugfix:
- Fix `cilHDF5CroppedReader` #462
- Correctly handle the Alt modifier and non 1 display pixel ratio, for Qt application with the viewer. #464

Requirements:
Expand All @@ -22,7 +23,6 @@ Build and CI:
- Use ubuntu v22.04 in the actions #446
- Add setuptools as a build requirement #446


## v24.1.0

Enhancements:
Expand Down
1 change: 0 additions & 1 deletion Wrappers/Python/ccpi/viewer/CILViewer2D.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,6 @@ def OnMouseWheelBackward(self, interactor, event):
def AutoWindowLevelOnVolumeRange(self, update_slice=True):
'''Auto-adjusts window-level for the slice, based on the 5 and 95th percentiles of the whole image volume.'''
cmin, cmax = self._viewer.getImageMapRange((5., 95.), method="scalar")
print("Auto range for volume: ", cmin, cmax)
window, level = self._viewer.getSliceWindowLevelFromRange(cmin, cmax)

self._viewer.imageSlice.GetProperty().SetColorLevel(level)
Expand Down
7 changes: 6 additions & 1 deletion Wrappers/Python/ccpi/viewer/utils/conversion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1713,12 +1713,17 @@ def RequestData(self, request, inInfo, outInfo):
full_reader = HDF5Reader()
full_reader.SetFileName(self.GetFileName())
full_reader.SetDatasetName(self.GetDatasetName())
dimensions = full_reader.GetDimensions()
reader = HDF5SubsetReader()
reader.SetInputConnection(full_reader.GetOutputPort())
# Either the TargetExtent or TargetZExtent should have been set.
# We prioritise the TargetExtent
if self.GetTargetExtent() is None:
extent = [0, -1, 0, -1, self.GetTargetZExtent[0], self.GetTargetZExtent[1]]
extent = [
0, dimensions[0] - 1, 0, dimensions[1] - 1,
self.GetTargetZExtent()[0],
self.GetTargetZExtent()[1]
]
else:
extent = self.GetTargetExtent()
reader.SetUpdateExtent(extent)
Expand Down
Loading