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

Switched away from using JSONify

Browse source
This commit is contained in:
Joel Collins 2020-04-24 16:05:01 +01:00
parent 4fffa1fcba
commit cda5cdbb44
9 changed files with 26 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,7 +3,7 @@ from labthings.server.extensions import BaseExtension
from labthings.server.view import View
from labthings.server.decorators import ThingAction, ThingProperty, marshal_task
from openflexure_microscope.devel import JsonResponse, request, jsonify, taskify, abort
from openflexure_microscope.devel import JsonResponse, request, taskify, abort
from openflexure_microscope.utilities import set_properties
import time
@ -309,7 +309,7 @@ class MeasureSharpnessAPI(View):
if not microscope:
abort(503, "No microscope connected. Unable to measure sharpness.")
return jsonify({"sharpness": measure_sharpness(microscope)})
return {"sharpness": measure_sharpness(microscope)}
@ThingAction

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

@ -1,7 +1,6 @@
from openflexure_microscope.devel import (
JsonResponse,
request,
jsonify,
taskify,
update_task_progress,
)