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

Fixed attaching lock failure

Browse source
This commit is contained in:
Joel Collins 2019-02-19 13:42:17 +00:00
parent 31efadd884
commit cc3f7f19df
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
openflexure_microscope/microscope.py
View file

@ -41,6 +41,9 @@ class Microscope(object):
else: else:
self.rc = OpenflexureConfig(expand=True) # Load config from default path self.rc = OpenflexureConfig(expand=True) # Load config from default path
# 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
# Attach initial hardware (may be NoneTypes) # Attach initial hardware (may be NoneTypes)
self.camera = None self.camera = None
self.stage = None self.stage = None
@ -63,9 +66,7 @@ class Microscope(object):
if 'fov' not in self.rc.config: if 'fov' not in self.rc.config:
self.rc.write({'fov': [0, 0]}) self.rc.write({'fov': [0, 0]})
# 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."""
return self return self