From cd4bab94ab8e6346fbc38543d13c9eb714d46ebe Mon Sep 17 00:00:00 2001 From: Joel Collins Date: Wed, 6 Mar 2019 21:08:56 +0000 Subject: [PATCH] Renamed stack plugin to scan --- openflexure_microscope/microscoperc.default.yaml | 1 + .../plugins/default/{stack => scan}/__init__.py | 0 .../plugins/default/{stack => scan}/plugin.py | 8 ++++---- 3 files changed, 5 insertions(+), 4 deletions(-) rename openflexure_microscope/plugins/default/{stack => scan}/__init__.py (100%) rename openflexure_microscope/plugins/default/{stack => scan}/plugin.py (96%) diff --git a/openflexure_microscope/microscoperc.default.yaml b/openflexure_microscope/microscoperc.default.yaml index ed0566a6..f1769970 100644 --- a/openflexure_microscope/microscoperc.default.yaml +++ b/openflexure_microscope/microscoperc.default.yaml @@ -15,4 +15,5 @@ picamera_settings: ~/.openflexure/picamera_settings.yaml # Default plugins plugins: - openflexure_microscope.plugins.default.autofocus:AutofocusPlugin + - openflexure_microscope.plugins.default.scan:ScanPlugin - openflexure_microscope.plugins.default.camera_calibration:Plugin \ No newline at end of file diff --git a/openflexure_microscope/plugins/default/stack/__init__.py b/openflexure_microscope/plugins/default/scan/__init__.py similarity index 100% rename from openflexure_microscope/plugins/default/stack/__init__.py rename to openflexure_microscope/plugins/default/scan/__init__.py diff --git a/openflexure_microscope/plugins/default/stack/plugin.py b/openflexure_microscope/plugins/default/scan/plugin.py similarity index 96% rename from openflexure_microscope/plugins/default/stack/plugin.py rename to openflexure_microscope/plugins/default/scan/plugin.py index 2763c55c..1410c9e3 100644 --- a/openflexure_microscope/plugins/default/stack/plugin.py +++ b/openflexure_microscope/plugins/default/scan/plugin.py @@ -8,14 +8,14 @@ from openflexure_microscope.plugins import MicroscopePlugin from openflexure_microscope.utilities import set_properties -class StackPlugin(MicroscopePlugin): +class ScanPlugin(MicroscopePlugin): """ Stack and tile plugin """ api_views = {} - def do_capture(self, + def capture(self, basename, scan_id, use_video_port: bool = False, @@ -88,7 +88,7 @@ class StackPlugin(MicroscopePlugin): if autofocus_enabled: self.microscope.plugin.default_autofocus.autofocus(range(-2*autofocus_dz, 3*autofocus_dz, autofocus_dz)) - self.do_capture( + self.capture( basename, scan_id, use_video_port=use_video_port, @@ -133,7 +133,7 @@ class StackPlugin(MicroscopePlugin): for i in range(steps): - self.do_capture( + self.capture( basename, scan_id, use_video_port=use_video_port,