From 9d1385231ddb0b2fbaaa6a1350663386004793c3 Mon Sep 17 00:00:00 2001 From: jaknapper Date: Thu, 1 May 2025 15:00:16 +0100 Subject: [PATCH] Rename jpeg_array to highres_array --- src/openflexure_microscope_server/things/autofocus.py | 2 +- src/openflexure_microscope_server/things/camera/__init__.py | 4 ++-- src/openflexure_microscope_server/things/capture.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/openflexure_microscope_server/things/autofocus.py b/src/openflexure_microscope_server/things/autofocus.py index 33b42f98..528195a4 100644 --- a/src/openflexure_microscope_server/things/autofocus.py +++ b/src/openflexure_microscope_server/things/autofocus.py @@ -316,7 +316,7 @@ class AutofocusThing(Thing): capture.capture_jpeg(filename=jpeg_path, cam=cam) elif capture_method == "hires_array": # A new way to get the full array - img = capture.capture_jpeg_array() + img = capture.capture_highres_array() _save_capture( jpeg_path, img, diff --git a/src/openflexure_microscope_server/things/camera/__init__.py b/src/openflexure_microscope_server/things/camera/__init__.py index 5b4f8c4a..6f84fe66 100644 --- a/src/openflexure_microscope_server/things/camera/__init__.py +++ b/src/openflexure_microscope_server/things/camera/__init__.py @@ -77,7 +77,7 @@ class CameraProtocol(Protocol): """Acquire one image from the preview stream and return its size""" ... - def capture_jpeg_array( + def capture_highres_array( self, ): ... @@ -176,7 +176,7 @@ class CameraStub(BaseCamera): raise NotImplementedError("Cameras must not inherit from CameraStub") @thing_action - def capture_jpeg_array( + def capture_highres_array( self, ): raise NotImplementedError("Cameras must not inherit from CameraStub") diff --git a/src/openflexure_microscope_server/things/capture.py b/src/openflexure_microscope_server/things/capture.py index f99e2791..c4ca7cae 100644 --- a/src/openflexure_microscope_server/things/capture.py +++ b/src/openflexure_microscope_server/things/capture.py @@ -55,9 +55,9 @@ class CaptureThing(Thing): jpeg.save(filename) @thing_action - def capture_jpeg_array(self, cam: CamDep): + def capture_highres_array(self, cam: CamDep): """Return a full resolution stream array""" - return cam.capture_jpeg_array() + return cam.capture_highres_array() @thing_action def _capture_array(self, cam: CamDep, metadata_getter: GetThingStates):