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

Added a useful read_config method to BaseCamera

Browse source
This commit is contained in:
Joel Collins 2019-09-20 14:12:49 +01:00
parent 33af3bf48c
commit 1c67b96895
3 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
openflexure_microscope/camera/pi.py
View file

@ -109,15 +109,20 @@ class PiCameraStreamer(BaseCamera):
Return config dictionary of the PiCameraStreamer.
"""
conf_dict = {
# Get config items from the base class
conf_dict = BaseCamera.read_config(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,
"picamera_settings": {},
}
})
# PiCamera parameters
# Include a subset of picamera properties
# TODO: Expand this subset so we have more metadata?
for key in PiCameraStreamer.picamera_settings_keys:
try:
value = getattr(self.camera, key)