From c76e3e0ed31c0f532308e2eb924bc8f0fc85a561 Mon Sep 17 00:00:00 2001 From: Joel Collins Date: Fri, 22 Nov 2019 13:42:40 +0000 Subject: [PATCH] Don't import picamera to build system metadata --- openflexure_microscope/microscope.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/openflexure_microscope/microscope.py b/openflexure_microscope/microscope.py index 8432ac56..981e78d6 100644 --- a/openflexure_microscope/microscope.py +++ b/openflexure_microscope/microscope.py @@ -10,7 +10,6 @@ from openflexure_microscope.stage.base import BaseStage from openflexure_microscope.stage.mock import MockStage from openflexure_microscope.camera.base import BaseCamera from openflexure_microscope.camera.mock import MockStreamer -from openflexure_microscope.camera.pi import PiCameraStreamer from openflexure_microscope.utilities import serialise_array_b64 from openflexure_microscope.plugins import PluginLoader @@ -286,16 +285,16 @@ class Microscope: } # Store an encoded copy of the PiCamera lens shading table, if it exists - if self.camera and isinstance(self.camera, PiCameraStreamer): + if self.camera and hasattr(self.camera, "read_lens_shading_table"): # Read LST. Returns None if no LST is active lst_arr = self.camera.read_lens_shading_table() b64_string, dtype, shape = serialise_array_b64(lst_arr) - + system_metadata["lens_shading_table"] = { "b64_string": b64_string, "dtype": dtype, - "shape": shape + "shape": shape, } - - return system_metadata \ No newline at end of file + + return system_metadata