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

Moved to a LabThings dependency for server

Browse source
This commit is contained in:
jtc42 2020-01-17 15:13:32 +00:00
parent a1223d8b28
commit 36334ed743
65 changed files with 546 additions and 2364 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,21 +5,21 @@ from typing import Tuple
from functools import reduce
from openflexure_microscope.camera.base import generate_basename
from openflexure_microscope.common.flask_labthings.find import (
from labthings.server.find import (
find_component,
find_extension,
)
from openflexure_microscope.common.flask_labthings.extensions import BaseExtension
from openflexure_microscope.common.flask_labthings.decorators import (
from labthings.server.extensions import BaseExtension
from labthings.server.decorators import (
marshal_task,
use_args,
ThingAction,
)
from openflexure_microscope.common.flask_labthings import fields
from labthings.server import fields
from openflexure_microscope.devel import taskify, abort, update_task_progress
from openflexure_microscope.common.flask_labthings.view import View
from labthings.server.view import View
import time