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

Blackened

Browse source
This commit is contained in:
Joel Collins 2019-11-06 22:13:39 +00:00
parent 4e7606aa0c
commit dd82528d78
3 changed files with 51 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

4
openflexure_microscope/api/app.py
View file

@ -90,7 +90,9 @@ api_microscope.attach(api_camera, api_stage)
# Restore loaded capture array to camera object # Restore loaded capture array to camera object
logging.debug("Restoring captures...") logging.debug("Restoring captures...")
api_microscope.camera.images = build_captures_from_exif(api_microscope.camera.paths["default"]) api_microscope.camera.images = build_captures_from_exif(
api_microscope.camera.paths["default"]
)
logging.debug("Microscope successfully attached!") logging.debug("Microscope successfully attached!")

8
openflexure_microscope/microscope.py
View file

@ -143,17 +143,13 @@ class Microscope:
self.attach_plugins(self.plugin_maps) self.attach_plugins(self.plugin_maps)
def has_real_stage(self): def has_real_stage(self):
if hasattr(self, "stage") and not isinstance( if hasattr(self, "stage") and not isinstance(self.stage, MockStage):
self.stage, MockStage
):
return True return True
else: else:
return False return False
def has_real_camera(self): def has_real_camera(self):
if hasattr(self, "camera") and not isinstance( if hasattr(self, "camera") and not isinstance(self.camera, MockStreamer):
self.camera, MockStreamer
):
return True return True
else: else:
return False return False

6
openflexure_microscope/plugins/default/scan/plugin.py
View file

@ -7,7 +7,11 @@ import logging
from openflexure_microscope.camera.base import generate_basename from openflexure_microscope.camera.base import generate_basename
from openflexure_microscope.devel import MicroscopePlugin, update_task_progress, update_task_data from openflexure_microscope.devel import (
MicroscopePlugin,
update_task_progress,
update_task_data,
)
from .api import TileScanAPI from .api import TileScanAPI