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

Added an option to reset LST to None

Browse source 
This doesn't seem to work until you restart - probably an issue in my
picamera fork.
This commit is contained in:
Richard Bowman 2020-03-24 17:42:49 +00:00
parent b9bb7d5dca
commit e6ad52f107
1 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -27,16 +27,14 @@ def pause_stream(scamera, resolution: Tuple[int, int] = None):
streaming = scamera.stream_active streaming = scamera.stream_active
old_resolution = scamera.camera.resolution old_resolution = scamera.camera.resolution
if streaming: if streaming:
logging.info("Stopping stream before recalibration") logging.info("Stopping stream in pause_stream context manager")
scamera.stop_stream_recording(resolution=resolution) scamera.stop_stream_recording(resolution=resolution)
try: try:
#if resolution is not None: # This code should be redundant...
# scamera.camera.resolution = (640, 480)
yield scamera yield scamera
finally: finally:
scamera.camera.resolution = old_resolution scamera.camera.resolution = old_resolution
if streaming: if streaming:
logging.info("Restarting stream after recalibration") logging.info("Restarting stream in pause_stream context manager")
scamera.start_stream_recording() scamera.start_stream_recording()
def recalibrate(microscope): def recalibrate(microscope):
@ -82,6 +80,22 @@ class FlattenLSTView(View):
logging.exception("Error flattening the lens shading table.") logging.exception("Error flattening the lens shading table.")
abort(503, "Couldn't flatten the lens shading table - do you have the forked PiCamera library installed?") abort(503, "Couldn't flatten the lens shading table - do you have the forked PiCamera library installed?")
@ThingAction
class DeleteLSTView(View):
def post(self):
microscope = find_component("org.openflexure.microscope")
if not microscope:
abort(503, "No microscope connected. Unable to flatten the lens shading table.")
try:
with pause_stream(microscope.camera) as scamera:
scamera.camera.lens_shading_table = None
microscope.save_settings()
except:
logging.exception("Error deleting the lens shading table.")
abort(503, "Couldn't flatten the lens shading table - do you have the forked PiCamera library installed?")
lst_extension_v2 = BaseExtension( lst_extension_v2 = BaseExtension(
"org.openflexure.calibration.picamera", version="2.0.0-beta.1", description="Routines to perform flat-field correction on the camera." "org.openflexure.calibration.picamera", version="2.0.0-beta.1", description="Routines to perform flat-field correction on the camera."
@ -93,3 +107,4 @@ lst_extension_v2.add_method(
lst_extension_v2.add_view(RecalibrateView, "/recalibrate") lst_extension_v2.add_view(RecalibrateView, "/recalibrate")
lst_extension_v2.add_view(FlattenLSTView, "/flatten_lens_shading_table") lst_extension_v2.add_view(FlattenLSTView, "/flatten_lens_shading_table")
lst_extension_v2.add_view(DeleteLSTView, "/delete_lens_shading_table")