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

Fixed linter errors

Browse source
This commit is contained in:
Richard Bowman 2021-04-21 13:38:14 +01:00
parent 8c50f73b34
commit 88de3089ea
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
openflexure_microscope/api/default_extensions/picamera_autocalibrate/extension.py
View file

@ -205,7 +205,7 @@ class AutoExposureFromRawView(ActionView):
} }
def post(self, args): def post(self, args):
with find_picamera() as (picamera, scamera, microscope): with find_picamera() as (picamera, _, _):
adjust_shutter_and_gain_from_raw(picamera, **args) adjust_shutter_and_gain_from_raw(picamera, **args)
@ -224,7 +224,7 @@ class AutoWhiteBalanceFromRawView(ActionView):
} }
def post(self, args): def post(self, args):
with find_picamera() as (picamera, scamera, microscope): with find_picamera() as (picamera, _, _):
adjust_white_balance_from_raw(picamera, **args) adjust_white_balance_from_raw(picamera, **args)
@ -238,5 +238,5 @@ class GetRawChannelPercentilesView(ActionView):
schema = fields.List(fields.Integer) schema = fields.List(fields.Integer)
def post(self, args): def post(self, args):
with find_picamera() as (picamera, scamera, microscope): with find_picamera() as (picamera, _, _):
return get_channel_percentiles(picamera, args["percentile"]) return get_channel_percentiles(picamera, args["percentile"])

3
openflexure_microscope/api/default_extensions/picamera_autocalibrate/recalibrate_utils.py
View file

@ -1,6 +1,5 @@
import logging import logging
import time import time
from fractions import Fraction
from typing import List, Optional, Tuple from typing import List, Optional, Tuple
import numpy as np import numpy as np
@ -40,7 +39,7 @@ def flat_lens_shading_table(camera: PiCamera) -> np.ndarray:
def adjust_exposure_to_setpoint(camera: PiCamera, setpoint: int): def adjust_exposure_to_setpoint(camera: PiCamera, setpoint: int):
"""Adjust the camera's exposure time until the maximum pixel value is <setpoint>.""" """Adjust the camera's exposure time until the maximum pixel value is <setpoint>."""
logging.info("Adjusting shutter speed to hit setpoint {}".format(setpoint)) logging.info(f"Adjusting shutter speed to hit setpoint {setpoint}")
for _ in range(3): for _ in range(3):
camera.shutter_speed = int( camera.shutter_speed = int(
camera.shutter_speed * setpoint / np.max(rgb_image(camera)) camera.shutter_speed * setpoint / np.max(rgb_image(camera))