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

Minor formatting changes

Browse source
This commit is contained in:
Joel Collins 2019-01-30 12:02:35 +00:00
parent 7ad1e7507f
commit 0c156128fc
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
openflexure_microscope/microscope.py
View file

@ -107,7 +107,7 @@ class Microscope(object):
logging.info("Attached dummy stage.") logging.info("Attached dummy stage.")
# If stage object has a lock # If stage object has a lock
if hasattr(self.stage, 'lock'): if hasattr(self.stage, 'lock'):
logging.info("Attaching {} to composite lock.".format(self.stage.lock)) logging.info("Attaching lock {} to composite lock.".format(self.stage.lock))
# Add the lock to the microscope composite lock # Add the lock to the microscope composite lock
self.lock.locks.append(self.stage.lock) self.lock.locks.append(self.stage.lock)

4
openflexure_microscope/plugins/example/plugin.py
View file

@ -50,10 +50,8 @@ class Plugin(MicroscopePlugin):
print("Starting a long-running task...") print("Starting a long-running task...")
n_array = [] n_array = []
#print("Acquiring camera and stage locks...")
#with self.microscope.camera.lock, self.microscope.stage.lock:
print("Acquiring composite microscope lock...") print("Acquiring composite microscope lock...")
with self.microscope.lock: with self.microscope.camera.lock, self.microscope.stage.lock:
for _ in range(t_run): for _ in range(t_run):
n_array.append(random.random()) n_array.append(random.random())
time.sleep(1) time.sleep(1)