From 3fdd242dd88b58cb0058e629b1f1791ef9e85673 Mon Sep 17 00:00:00 2001 From: Steven Zeltmann Date: Mon, 5 Feb 2024 13:49:55 -0500 Subject: [PATCH] ensure RAW exports get the unscaled data --- src/py4D_browser/menu_actions.py | 7 ++++++- src/py4D_browser/update_views.py | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/py4D_browser/menu_actions.py b/src/py4D_browser/menu_actions.py index 3c63522..ffd83ed 100644 --- a/src/py4D_browser/menu_actions.py +++ b/src/py4D_browser/menu_actions.py @@ -96,7 +96,7 @@ def export_datacube(self, save_format: str): ) if response == QMessageBox.Cancel: - print("Cancelling due to user guilt") + self.statusBar().showMessage("Cancelling due to user guilt", 5_000) return filename = self.get_savefile_name(save_format) @@ -135,6 +135,11 @@ def export_virtual_image(self, im_format: str, im_type: str): elif im_format == "TIFF (raw)": from tifffile import TiffWriter + vimg = ( + self.unscaled_realspace_image + if im_type == "image" + else self.unscaled_diffraction_image + ) with TiffWriter(filename) as tw: tw.write(vimg) diff --git a/src/py4D_browser/update_views.py b/src/py4D_browser/update_views.py index e95ce87..e88c3b1 100644 --- a/src/py4D_browser/update_views.py +++ b/src/py4D_browser/update_views.py @@ -171,6 +171,9 @@ def update_real_space_view(self, reset=False): new_view = np.sqrt(np.maximum(vimg, 0)) else: raise ValueError("Mode not recognized") + + self.unscaled_realspace_image = vimg + self.real_space_widget.setImage( new_view.T, autoLevels=reset or self.realspace_rescale_button.latched, @@ -232,6 +235,8 @@ def update_diffraction_space_view(self, reset=False): else: raise ValueError("Detector shape not recognized") + self.unscaled_diffraction_image = DP + if scaling_mode == "Linear": new_view = DP elif scaling_mode == "Log":