Skip to content

Fix imsave #34

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
ercius merged 2 commits into from
Aug 12, 2025
Merged

Fix imsave #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db79a01
Use tifffile imwrite instead of imsave. Check for file extension in r…
Aug 12, 2025
1de9125
remove limit on tifffile version and bump dusc version
Aug 12, 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
10 changes: 6 additions & 4 deletions DuSC_explorer/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import pyqtgraph as pg
from pyqtgraph.graphicsItems.ROI import Handle
import numpy as np
from tifffile import imsave
from tifffile import imwrite
from numba import jit, prange
import stempy.io as stio

Expand Down Expand Up @@ -400,18 +400,20 @@ def _on_export(self):
out_path = Path(file_name)
else:
return

# Get the data and change to float
if action.text() == 'Export diffraction (TIF)':
if out_path.suffix != '.tif':
out_path = out_path.with_suffix('.tif')
imsave(out_path, self.dp.reshape(self.frame_dimensions).astype(np.float32))
imwrite(out_path, self.dp.reshape(self.frame_dimensions).astype(np.float32))
elif action.text() == 'Export diffraction (SMV)':
if out_path.suffix != '.img':
out_path = out_path.with_suffix('.img')
self._write_smv(out_path)
elif action.text() == 'Export real (TIF)':
imsave(out_path, self.rs.reshape(self.scan_dimensions).astype(np.float32))
if out_path.suffix != '.tif':
out_path = out_path.with_suffix('.tif')
imwrite(out_path, self.rs.reshape(self.scan_dimensions).astype(np.float32))
else:
print('Export: unknown action {}'.format(action.text()))

Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ authors = [{name = "Peter Ercius", email="percius@lbl.gov"}]
description = "Graphical user interface to view Dual Space Crystallography data from the 4D Camera of the Molecular Foundry."
readme = "README.md"
requires-python = ">=3.8"
dependencies = ['stempy>=3.0', 'pyqtgraph>=0.13', 'tifffile<=v2025.1.10', 'h5py>=2.9.0', 'numpy', 'qtpy', 'numba>=0.56', 'PyQt5']
version = "1.1.3"
dependencies = ['stempy>=3.0', 'pyqtgraph>=0.13', 'tifffile', 'h5py>=2.9.0', 'numpy', 'qtpy', 'numba>=0.56', 'PyQt5']
version = "1.1.4"

[project.scripts]
DuSC_explorer = "DuSC_explorer:open_file"