rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'settings-fix' into 'master'

Browse source 
Fixed camera settings read

See merge request openflexure/openflexure-microscope-server!90
This commit is contained in:
Joel Collins 2020-11-22 16:13:39 +00:00
commit 6f1d12045c
2 changed files with 14 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

16
openflexure_microscope/camera/mock.py
View file

@ -136,17 +136,13 @@ class MissingCamera(BaseCamera):
"""
# Get config items from the base class
conf_dict = BaseCamera.read_settings(self)
conf_dict = {
"stream_resolution": self.stream_resolution,
"image_resolution": self.image_resolution,
"numpy_resolution": self.numpy_resolution,
"jpeg_quality": self.jpeg_quality,
}
# Include device-specific config items
conf_dict.update(
{
"stream_resolution": self.stream_resolution,
"image_resolution": self.image_resolution,
"numpy_resolution": self.numpy_resolution,
"jpeg_quality": self.jpeg_quality,
}
)
return conf_dict

23
openflexure_microscope/camera/pi.py
View file

@ -127,21 +127,14 @@ 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(
{
"stream_resolution": self.stream_resolution,
"image_resolution": self.image_resolution,
"numpy_resolution": self.numpy_resolution,
"jpeg_quality": self.jpeg_quality,
"mjpeg_quality": self.mjpeg_quality,
"picamera": {},
}
)
conf_dict = {
"stream_resolution": self.stream_resolution,
"image_resolution": self.image_resolution,
"numpy_resolution": self.numpy_resolution,
"jpeg_quality": self.jpeg_quality,
"mjpeg_quality": self.mjpeg_quality,
"picamera": {},
}
# Include a subset of picamera properties. Excludes lens shading table
for key in PiCameraStreamer.picamera_settings_keys: