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

Moved frames_iterator scope

Browse source
This commit is contained in:
Joel Collins 2020-11-17 11:21:01 +00:00
parent c9c29a7db4
commit 3058c67542
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
openflexure_microscope/camera/base.py
View file

@ -97,9 +97,6 @@ class BaseCamera(metaclass=ABCMeta):
self.stream = FrameStream() self.stream = FrameStream()
# Iterator function that yields new frames as they are acquired
self.frames_iterator = None
self.frame = None self.frame = None
self.last_access = 0 self.last_access = 0
self.event = ClientEvent() self.event = ClientEvent()
@ -215,12 +212,12 @@ class BaseCamera(metaclass=ABCMeta):
def _thread(self): def _thread(self):
"""Camera background thread.""" """Camera background thread."""
# Set the camera object's frame iterator # Set the camera object's frame iterator
self.frames_iterator = self.frames() frames_iterator = self.frames()
logging.debug("Entering worker thread.") logging.debug("Entering worker thread.")
self.stream_active = True self.stream_active = True
for frame in self.frames_iterator: for frame in frames_iterator:
# Store most recent frame # Store most recent frame
self.frame = frame self.frame = frame
# Signal to clients that a new frame is available # Signal to clients that a new frame is available
@ -231,7 +228,7 @@ class BaseCamera(metaclass=ABCMeta):
try: try:
if self.stop is True: if self.stop is True:
logging.debug("Worker thread flagged for stop.") logging.debug("Worker thread flagged for stop.")
self.frames_iterator.close() frames_iterator.close()
break break
except AttributeError: except AttributeError: