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

Added CompositeLock

Browse source
This commit is contained in:
Joel Collins 2019-01-24 14:04:41 +00:00
parent 25aeae0233
commit fb26bcb7f3
1 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
openflexure_microscope/microscope.py
View file

@ -14,6 +14,7 @@ from .plugins import PluginMount
from .config import load_config, save_config, convert_config from .config import load_config, save_config, convert_config
from .utilities import axes_to_array from .utilities import axes_to_array
from .task import TaskOrchestrator from .task import TaskOrchestrator
from .lock import CompositeLock
class Microscope(object): class Microscope(object):
@ -53,6 +54,9 @@ class Microscope(object):
if not 'fov' in self._config: if not 'fov' in self._config:
self._config['fov'] = [0, 0] # Assumes pi camera 2, and 40x objective self._config['fov'] = [0, 0] # Assumes pi camera 2, and 40x objective
# Initialise with an empty composite lock
self.lock = CompositeLock([]) #: :py:class:`openflexure_microscope.lock.CompositeLock`: Composite lock controlling thread access to multiple pieces of hardware
def __enter__(self): def __enter__(self):
"""Create microscope on context enter.""" """Create microscope on context enter."""
@ -88,6 +92,11 @@ class Microscope(object):
logging.info("Attached camera {}".format(camera)) logging.info("Attached camera {}".format(camera))
elif not self.camera: elif not self.camera:
logging.info("Attached dummy camera.") logging.info("Attached dummy camera.")
# If camera has a lock
if hasattr(self.camera, 'lock'):
logging.info("Attaching {} to composite lock.".format(self.camera.lock))
# Add the lock to the microscope composite lock
self.lock.locks.append(self.camera.lock)
logging.debug("Attaching stage...") logging.debug("Attaching stage...")
self.stage = stage #: :py:class:`openflexure_stage.stage.OpenFlexureStage`: OpenFlexure stage object self.stage = stage #: :py:class:`openflexure_stage.stage.OpenFlexureStage`: OpenFlexure stage object
@ -96,6 +105,11 @@ class Microscope(object):
self.stage.backlash = np.zeros(3, dtype=np.int) self.stage.backlash = np.zeros(3, dtype=np.int)
elif not self.stage: elif not self.stage:
logging.info("Attached dummy stage.") logging.info("Attached dummy stage.")
# If stage object has a lock
if hasattr(self.stage, 'lock'):
logging.info("Attaching {} to composite lock.".format(self.stage.lock))
# Add the lock to the microscope composite lock
self.lock.locks.append(self.stage.lock)
def attach_plugin_maps(self, plugin_maps): def attach_plugin_maps(self, plugin_maps):
""" """