From 9f259b7f3eafbca6a041bbb1915df3dd3c7bf0d9 Mon Sep 17 00:00:00 2001 From: Joel Collins Date: Tue, 8 Jan 2019 15:53:58 +0000 Subject: [PATCH] Updated capture route for new capture output structure --- .../api/v1/blueprints/camera/capture.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/openflexure_microscope/api/v1/blueprints/camera/capture.py b/openflexure_microscope/api/v1/blueprints/camera/capture.py index be4f113c..c2f88395 100644 --- a/openflexure_microscope/api/v1/blueprints/camera/capture.py +++ b/openflexure_microscope/api/v1/blueprints/camera/capture.py @@ -111,14 +111,17 @@ class ListAPI(MicroscopeView): else: abort(400) - capture_obj = self.microscope.camera.capture( - write_to_file=True, # Always write data to disk when using API - keep_on_disk=keep_on_disk, + output = self.microscope.camera.new_image( + write_to_file=True, + keep_on_disk=keep_on_disk, + filename=filename) + + self.microscope.camera.capture( + output, use_video_port=use_video_port, - filename=filename, resize=resize) - return jsonify(capture_obj.metadata) + return jsonify(output.metadata) class CaptureAPI(MicroscopeView):