Fixed camera settings read (25d3b15d) · Commits · OpenFlexure / openflexure-microscope-server

openflexure_microscope/camera/mock.py

+7 −11

Original line number	Diff line number	Diff line
		@@ -136,17 +136,13 @@ class MissingCamera(BaseCamera):
		"""

		# Get config items from the base class
		conf_dict = BaseCamera.read_settings(self)

		# Include device-specific config items
		conf_dict.update(
		{
		conf_dict = {
		"stream_resolution": self.stream_resolution,
		"image_resolution": self.image_resolution,
		"numpy_resolution": self.numpy_resolution,
		"jpeg_quality": self.jpeg_quality,
		}
		)


		return conf_dict

+8 −15

Original line number	Diff line number	Diff line
		@@ -127,13 +127,7 @@ class PiCameraStreamer(BaseCamera):
		"""
		Return config dictionary of the PiCameraStreamer.
		"""

		# Get config items from the base class
		conf_dict = BaseCamera.read_settings(self)

		# Include device-specific config items
		conf_dict.update(
		{
		conf_dict = {
		"stream_resolution": self.stream_resolution,
		"image_resolution": self.image_resolution,
		"numpy_resolution": self.numpy_resolution,
		@@ -141,7 +135,6 @@ class PiCameraStreamer(BaseCamera):
		"mjpeg_quality": self.mjpeg_quality,
		"picamera": {},
		}
		)

		# Include a subset of picamera properties. Excludes lens shading table
		for key in PiCameraStreamer.picamera_settings_keys: