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

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

@ -6,14 +6,13 @@ from typing import Tuple
from functools import reduce
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.actions import current_action
from openflexure_microscope.devel import abort, update_task_progress
from labthings import fields, find_component, find_extension, current_action, update_action_progress
from labthings.views import View, ActionView
from labthings.extensions import BaseExtension
from openflexure_microscope.devel import abort
from labthings.server.view import View, ActionView
import time
@ -209,7 +208,7 @@ class ScanExtension(BaseExtension):
)
# Update task progress
self._images_captured_so_far += 1
update_task_progress(self.progress())
update_action_progress(self.progress())
else:
logging.debug("Entering z-stack")
self.stack(
@ -279,7 +278,7 @@ class ScanExtension(BaseExtension):
)
# Update task progress
self._images_captured_so_far += 1
update_task_progress(self.progress())
update_action_progress(self.progress())
if current_action() and current_action().stopped:
return