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

Updated tasks nomenclature

Browse source
This commit is contained in:
Joel Collins 2020-07-21 12:54:42 +01:00
parent 56051f8863
commit 24398ba7dc
27 changed files with 100 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

6
openflexure_microscope/api/v2/views/actions/__init__.py
View file

@ -4,9 +4,9 @@ Top-level representation of enabled actions
from flask import url_for
from . import camera, stage, system
from labthings.server.view import View
from labthings.server.find import current_labthing
from labthings.server.utilities import description_from_view
from labthings import current_labthing
from labthings.views import View
from labthings.utilities import description_from_view
_actions = {
"capture": {

5
openflexure_microscope/api/v2/views/actions/camera.py
View file

@ -1,8 +1,7 @@
from openflexure_microscope.api.utilities import get_bool, JsonResponse
from labthings.server.view import View, ActionView
from labthings.server.find import find_component
from labthings.views import View, ActionView
from labthings import find_component, fields
from labthings.server import fields
from openflexure_microscope.utilities import filter_dict
from openflexure_microscope.api.v2.views.captures import CaptureSchema

5
openflexure_microscope/api/v2/views/actions/stage.py
View file

@ -1,7 +1,6 @@
from openflexure_microscope.api.utilities import JsonResponse
from labthings.server.view import View, ActionView
from labthings.server.find import find_component
from labthings.server import fields
from labthings.views import View, ActionView
from labthings import find_component, fields
from openflexure_microscope.utilities import axes_to_array, filter_dict

2
openflexure_microscope/api/v2/views/actions/system.py
View file

@ -1,4 +1,4 @@
from labthings.server.view import View, ActionView
from labthings.views import View, ActionView
import subprocess
import os
from sys import platform

7
openflexure_microscope/api/v2/views/instrument.py
View file

@ -1,9 +1,8 @@
from openflexure_microscope.api.utilities import JsonResponse
from labthings.core.utilities import get_by_path, set_by_path, create_from_path
from labthings.server.find import find_component
from labthings.server.view import View, PropertyView
from labthings import find_component
from labthings.views import View, PropertyView
from labthings.utilities import get_by_path, set_by_path, create_from_path
from flask import request, abort
import logging

8
openflexure_microscope/api/v2/views/streams.py
View file

@ -1,10 +1,10 @@
from openflexure_microscope.api.utilities import gen, JsonResponse
from labthings.core.utilities import get_by_path, set_by_path, create_from_path
from labthings import find_component
from labthings.utilities import get_by_path, set_by_path, create_from_path
from labthings.views import View, PropertyView
from labthings.server.find import find_component
from labthings.server.view import View, PropertyView
from labthings.server.responses import Response
from flask import Response
class MjpegStream(PropertyView):