From 54c5605cb1f8e5fa1d28b5170423ef9c0c97a7a2 Mon Sep 17 00:00:00 2001 From: Joel Collins Date: Tue, 21 Jul 2020 11:57:33 +0100 Subject: [PATCH] Removed use of deprecated current_task_stopped --- openflexure_microscope/api/default_extensions/scan.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openflexure_microscope/api/default_extensions/scan.py b/openflexure_microscope/api/default_extensions/scan.py index 62f201fa..4e2414c4 100644 --- a/openflexure_microscope/api/default_extensions/scan.py +++ b/openflexure_microscope/api/default_extensions/scan.py @@ -9,7 +9,7 @@ from openflexure_microscope.captures.capture_manager import generate_basename from labthings.server.find import find_component, find_extension from labthings.server.extensions import BaseExtension from labthings.server import fields -from labthings.tasks import current_task_stopped +from labthings.actions import current_action from openflexure_microscope.devel import abort, update_task_progress @@ -225,7 +225,7 @@ class ScanExtension(BaseExtension): annotations=annotations, tags=tags, ) - if current_task_stopped(): + if current_action() and current_action().stopped: return # Make sure we use our current best estimate of focus (i.e. the current position) next point next_z = microscope.stage.position[2] @@ -280,7 +280,7 @@ class ScanExtension(BaseExtension): # Update task progress self._images_captured_so_far += 1 update_task_progress(self.progress()) - if current_task_stopped(): + if current_action() and current_action().stopped: return if i != steps - 1: