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

Default capture resolution to MAX_RESOLUTION

Browse source
This commit is contained in:
Joel Collins 2019-05-20 10:06:42 +01:00
parent 78882ab4c5
commit 1fe8ea18d8
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
openflexure_microscope/camera/pi.py
View file

@ -41,8 +41,8 @@ from .set_picamera_gain import set_analog_gain, set_digital_gain
# Handle config and picamera settings # Handle config and picamera settings
CONFIG_KEYS = { CONFIG_KEYS = {
'video_resolution': (832, 624), 'video_resolution': (1640, 1232),
'image_resolution': (2592, 1944), 'image_resolution': (2592, 1944), # Default for PiCamera v1. Overridden in __init__
'numpy_resolution': (1312, 976), 'numpy_resolution': (1312, 976),
'jpeg_quality': 75, 'jpeg_quality': 75,
'picamera_settings': { 'picamera_settings': {
@ -86,6 +86,11 @@ class StreamingCamera(BaseCamera):
# Populate config and settings with all available keys # Populate config and settings with all available keys
self.config.update(CONFIG_KEYS) self.config.update(CONFIG_KEYS)
# Update config based on PiCamera parameters
self.config.update({
'image_resolution': tuple(self.camera.MAX_RESOLUTION)
})
# Load config dictionary if passed # Load config dictionary if passed
if config: if config:
self.apply_config(config) self.apply_config(config)

5
openflexure_microscope/microscoperc.default.yaml
View file

@ -1,8 +1,3 @@
# Resolutions for streaming and capture
video_resolution: [832, 624]
image_resolution: [2592, 1944]
numpy_resolution: [1312, 976]
# Field of view, in stage steps # Field of view, in stage steps
fov: [4100, 3146] fov: [4100, 3146]