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

Renamed devices to components

Browse source
This commit is contained in:
Joel Collins 2020-01-13 11:08:05 +00:00
parent 6b99873d53
commit 4003e4e65c
11 changed files with 60 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

8
openflexure_microscope/api/default_extensions/autofocus.py
View file

@ -1,4 +1,4 @@
from openflexure_microscope.common.flask_labthings.find import find_device
from openflexure_microscope.common.flask_labthings.find import find_component
from openflexure_microscope.common.flask_labthings.extensions import BaseExtension
from openflexure_microscope.common.flask_labthings.resource import Resource
from openflexure_microscope.common.flask_labthings.decorators import (
@ -294,7 +294,7 @@ def fast_up_down_up_autofocus(
class MeasureSharpnessAPI(Resource):
def post(self):
microscope = find_device("org.openflexure.microscope")
microscope = find_component("org.openflexure.microscope")
if not microscope:
abort(503, "No microscope connected. Unable to measure sharpness.")
@ -310,7 +310,7 @@ class AutofocusAPI(Resource):
def post(self):
payload = JsonResponse(request)
microscope = find_device("org.openflexure.microscope")
microscope = find_component("org.openflexure.microscope")
if not microscope:
abort(503, "No microscope connected. Unable to autofocus.")
@ -337,7 +337,7 @@ class FastAutofocusAPI(Resource):
def post(self):
payload = JsonResponse(request)
microscope = find_device("org.openflexure.microscope")
microscope = find_component("org.openflexure.microscope")
if not microscope:
abort(503, "No microscope connected. Unable to autofocus.")

4
openflexure_microscope/api/default_extensions/scan.py
View file

@ -6,7 +6,7 @@ from functools import reduce
from openflexure_microscope.camera.base import generate_basename
from openflexure_microscope.common.flask_labthings.find import (
find_device,
find_component,
find_extension,
)
from openflexure_microscope.common.flask_labthings.extensions import BaseExtension
@ -360,7 +360,7 @@ class TileScanAPI(Resource):
)
@marshal_task
def post(self, args):
microscope = find_device("org.openflexure.microscope")
microscope = find_component("org.openflexure.microscope")
if not microscope:
abort(503, "No microscope connected. Unable to autofocus.")

4
openflexure_microscope/api/default_extensions/zip_builder.py
View file

@ -14,7 +14,7 @@ import zipfile
import tempfile
import logging
from openflexure_microscope.common.flask_labthings.find import find_device
from openflexure_microscope.common.flask_labthings.find import find_component
from openflexure_microscope.common.flask_labthings.resource import Resource
from openflexure_microscope.common.flask_labthings.extensions import BaseExtension
from openflexure_microscope.common.flask_labthings.decorators import (
@ -100,7 +100,7 @@ class ZipBuilderAPIView(Resource):
def post(self):
ids = list(JsonResponse(request).json)
microscope = find_device("org.openflexure.microscope")
microscope = find_component("org.openflexure.microscope")
task = taskify(default_zip_manager.build_zip_from_capture_ids)(microscope, ids)