Load capture objects from files. Remove YAML database.

This commit is contained in:
Joel Collins 2019-05-15 16:32:58 +01:00
parent f8e647198a
commit 092181348b
9 changed files with 64 additions and 119 deletions

View file

@ -1,4 +1,5 @@
import numpy as np
import logging
from openflexure_microscope.api.v1.views import MicroscopeViewPlugin
from openflexure_microscope.api.utilities import JsonPayload
@ -19,7 +20,7 @@ class AutofocusAPI(MicroscopeViewPlugin):
# Figure out the range of z values to use
dz = payload.param("dz", default=np.linspace(-300, 300, 7), convert=np.array)
print("Running autofocus...")
logging.info("Running autofocus...")
task = self.microscope.task.start(self.plugin.autofocus, dz)
# return a handle on the autofocus task
@ -35,7 +36,7 @@ class FastAutofocusAPI(MicroscopeViewPlugin):
if backlash < 0:
backlash = None
print("Running autofocus...")
logging.info("Running autofocus...")
task = self.microscope.task.start(self.plugin.fast_autofocus, dz, backlash=backlash)
# return a handle on the autofocus task

View file

@ -14,7 +14,7 @@ class RecalibrateAPIView(MicroscopeViewPlugin):
# TODO: Figure out the range of z values to use
print("Starting microscope recalibration...")
logging.info("Starting microscope recalibration...")
task = self.microscope.task.start(self.plugin.recalibrate)
# Return a handle on the autofocus task

View file

@ -2,7 +2,7 @@ from openflexure_microscope.api.v1.views import MicroscopeViewPlugin
from openflexure_microscope.api.utilities import JsonPayload
from flask import request, jsonify, abort
import logging
class TileScanAPI(MicroscopeViewPlugin):
def post(self):
@ -34,7 +34,7 @@ class TileScanAPI(MicroscopeViewPlugin):
metadata = payload.param('metadata', default={}, convert=dict)
tags = payload.param('tags', default=[], convert=list)
print("Running tile scan...")
logging.info("Running tile scan...")
task = self.microscope.task.start(
self.plugin.tile,
basename=filename,