From 5df5651fc22369214005a1febd293d07ab04cef3 Mon Sep 17 00:00:00 2001 From: Julian Stirling Date: Fri, 19 Dec 2025 10:00:43 +0000 Subject: [PATCH] Adjust name for a number of propery/setting setters --- .../things/camera/__init__.py | 4 ++-- .../things/camera/picamera.py | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/openflexure_microscope_server/things/camera/__init__.py b/src/openflexure_microscope_server/things/camera/__init__.py index fa20710f..455459cf 100644 --- a/src/openflexure_microscope_server/things/camera/__init__.py +++ b/src/openflexure_microscope_server/things/camera/__init__.py @@ -584,7 +584,7 @@ class BaseCamera(lt.Thing): return self._detector_name @detector_name.setter - def detector_name(self, name: str) -> None: + def _set_detector_name(self, name: str) -> None: """Validate and set detector_name.""" if name not in self.background_detectors: self.logger.warning(f"{name} is not a valid background detector name.") @@ -633,7 +633,7 @@ class BaseCamera(lt.Thing): return data @background_detector_data.setter - def background_detector_data(self, data: dict) -> None: + def _set_background_detector_data(self, data: dict) -> None: """Set the data for each detector. Only to be used as settings are loaded from disk. Do not call over HTTP. This needs to be updated once LbaThings Settings can be diff --git a/src/openflexure_microscope_server/things/camera/picamera.py b/src/openflexure_microscope_server/things/camera/picamera.py index 17bfec18..e9747cd3 100644 --- a/src/openflexure_microscope_server/things/camera/picamera.py +++ b/src/openflexure_microscope_server/things/camera/picamera.py @@ -215,7 +215,7 @@ class StreamingPiCamera2(BaseCamera): return self._analogue_gain @analogue_gain.setter - def analogue_gain(self, value: float) -> None: + def _set_analogue_gain(self, value: float) -> None: self._analogue_gain = value if self.streaming: with self._streaming_picamera() as cam: @@ -235,7 +235,7 @@ class StreamingPiCamera2(BaseCamera): return self._colour_gains @colour_gains.setter - def colour_gains(self, value: tuple[float, float]) -> None: + def _set_colour_gains(self, value: tuple[float, float]) -> None: self._colour_gains = value if self.streaming: with self._streaming_picamera() as cam: @@ -259,7 +259,7 @@ class StreamingPiCamera2(BaseCamera): return self._exposure_time @exposure_time.setter - def exposure_time(self, value: int) -> None: + def _set_exposure_time(self, value: int) -> None: self._exposure_time = value if self.streaming: with self._streaming_picamera() as cam: @@ -303,7 +303,7 @@ class StreamingPiCamera2(BaseCamera): return SensorModeSelector(**self._sensor_mode) @sensor_mode.setter - def sensor_mode(self, new_mode: Optional[SensorModeSelector | dict]) -> None: + def _set_sensor_mode(self, new_mode: Optional[SensorModeSelector | dict]) -> None: """Change the sensor mode used.""" if new_mode is None: self._sensor_mode = None @@ -873,7 +873,7 @@ class StreamingPiCamera2(BaseCamera): return tf_utils.get_lst(self.tuning) @lens_shading_tables.setter - def lens_shading_tables(self, lst: tf_utils.LensShading) -> None: + def _set_lens_shading_tables(self, lst: tf_utils.LensShading) -> None: """Set the lens shading tables.""" with self._streaming_picamera(pause_stream=True): self.tuning = tf_utils.set_lst(