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

Fixed imports, and PEP8 styling

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
openflexure_microscope/plugins/default/scan/__init__.py
View file

@ -1 +1 @@
from .plugin import StackPlugin from .plugin import ScanPlugin

5
openflexure_microscope/plugins/default/scan/api.py
View file

@ -1,5 +1,3 @@
import numpy as np
from openflexure_microscope.api.v1.views import MicroscopeViewPlugin from openflexure_microscope.api.v1.views import MicroscopeViewPlugin
from openflexure_microscope.api.utilities import JsonPayload from openflexure_microscope.api.utilities import JsonPayload
@ -46,14 +44,13 @@ class TileScanAPI(MicroscopeViewPlugin):
return jsonify(task.state, 202) return jsonify(task.state, 202)
class ZStackAPI(MicroscopeViewPlugin): class ZStackAPI(MicroscopeViewPlugin):
def post(self): def post(self):
payload = JsonPayload(request) payload = JsonPayload(request)
# Get params # Get params
name = payload.param('name') 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) steps = payload.param('steps', default=5, convert=int)
center = payload.param('center', default=True, convert=bool) center = payload.param('center', default=True, convert=bool)

8
openflexure_microscope/plugins/default/scan/plugin.py
View file

@ -5,10 +5,10 @@ import uuid
from openflexure_microscope.camera.base import generate_basename from openflexure_microscope.camera.base import generate_basename
from openflexure_microscope.plugins import MicroscopePlugin from openflexure_microscope.plugins import MicroscopePlugin
from openflexure_microscope.utilities import set_properties
from .api import TileScanAPI, ZStackAPI from .api import TileScanAPI, ZStackAPI
class ScanPlugin(MicroscopePlugin): class ScanPlugin(MicroscopePlugin):
""" """
Stack and tile plugin Stack and tile plugin
@ -19,7 +19,6 @@ class ScanPlugin(MicroscopePlugin):
'/stack': ZStackAPI, '/stack': ZStackAPI,
} }
def capture(self, def capture(self,
basename, basename,
scan_id, scan_id,
@ -95,7 +94,8 @@ class ScanPlugin(MicroscopePlugin):
for j in range(grid[1]): for j in range(grid[1]):
if autofocus_enabled: if autofocus_enabled:
self.microscope.plugin.default_autofocus.autofocus(range(-2*autofocus_dz, 3*autofocus_dz, autofocus_dz)) self.microscope.plugin.default_autofocus.autofocus(
range(-2 * autofocus_dz, 3 * autofocus_dz, autofocus_dz))
self.capture( self.capture(
basename, basename,
@ -120,7 +120,7 @@ class ScanPlugin(MicroscopePlugin):
self, self,
basename: str = None, basename: str = None,
step_size: int = 100, step_size: int = 100,
steps: list = 5, steps: int = 5,
center: bool = True, center: bool = True,
use_video_port: bool = False, use_video_port: bool = False,
resize: Tuple[int, int] = None, resize: Tuple[int, int] = None,