Fixed imports, and PEP8 styling

This commit is contained in:
Joel Collins 2019-03-07 10:58:08 +00:00
parent 298bc2ba6a
commit 89ea6a69de
3 changed files with 30 additions and 33 deletions

View file

@ -1,5 +1,3 @@
import numpy as np
from openflexure_microscope.api.v1.views import MicroscopeViewPlugin
from openflexure_microscope.api.utilities import JsonPayload
@ -9,7 +7,7 @@ from flask import request, jsonify, abort
class TileScanAPI(MicroscopeViewPlugin):
def post(self):
payload = JsonPayload(request)
# Get params
name = payload.param('name')
step_size = payload.param('step_size', default=[2000, 1500], convert=list)
@ -31,29 +29,28 @@ class TileScanAPI(MicroscopeViewPlugin):
print("Running tile scan...")
task = self.microscope.task.start(
self.plugin.tile,
basename = name,
step_size = step_size,
grid = grid,
autofocus_dz = autofocus_dz,
use_video_port = use_video_port,
resize = resize,
bayer = bayer,
metadata = metadata,
tags = tags
basename=name,
step_size=step_size,
grid=grid,
autofocus_dz=autofocus_dz,
use_video_port=use_video_port,
resize=resize,
bayer=bayer,
metadata=metadata,
tags=tags
)
# return a handle on the autofocus task
return jsonify(task.state, 202)
class ZStackAPI(MicroscopeViewPlugin):
def post(self):
payload = JsonPayload(request)
# Get params
name = payload.param('name')
step_size = payload.param('step_size', default=[2000, 1500], convert=list)
step_size = payload.param('step_size', default=100, convert=int)
steps = payload.param('steps', default=5, convert=int)
center = payload.param('center', default=True, convert=bool)
@ -72,16 +69,16 @@ class ZStackAPI(MicroscopeViewPlugin):
print("Running tile scan...")
task = self.microscope.task.start(
self.plugin.stack,
basename = name,
step_size = step_size,
steps = steps,
center = center,
use_video_port = use_video_port,
resize = resize,
bayer = bayer,
metadata = metadata,
tags = tags
basename=name,
step_size=step_size,
steps=steps,
center=center,
use_video_port=use_video_port,
resize=resize,
bayer=bayer,
metadata=metadata,
tags=tags
)
# return a handle on the autofocus task
return jsonify(task.state, 202)
return jsonify(task.state, 202)