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

Minor cleaning

Browse source
This commit is contained in:
Joel Collins 2018-11-20 19:04:23 +00:00
parent c249e846dc
commit 838c832272
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
openflexure_microscope/camera/capture.py
View file

@ -24,7 +24,7 @@ class StreamObject(object):
"""Create a new StreamObject, to manage capture data.""" """Create a new StreamObject, to manage capture data."""
# Store a nice ID # Store a nice ID
self.id = uuid.uuid4().hex self.id = uuid.uuid4().hex
logging.info("Created {}".format(self.id)) logging.info("Created StreamObject {}".format(self.id))
# Store file format # Store file format
self.format = fmt self.format = fmt
@ -32,7 +32,7 @@ class StreamObject(object):
# Create file name. Default to UUID # Create file name. Default to UUID
if not filename: if not filename:
filename = self.id filename = self.id
self.build_file_path(filename, folder, fmt) self.build_file_path(filename, folder, self.format)
# Byte stream properties # Byte stream properties
self.stream = io.BytesIO() # Byte stream that data will be written to self.stream = io.BytesIO() # Byte stream that data will be written to
@ -55,7 +55,7 @@ class StreamObject(object):
# Object lock # Object lock
self.locked = False self.locked = False
# Thumbnail (populated only for JPEG captures) # Thumbnail (populated only for PIL captures)
self.thumb_bytes = None self.thumb_bytes = None
def __enter__(self): def __enter__(self):
@ -168,7 +168,6 @@ class StreamObject(object):
else: # If data stream is empty else: # If data stream is empty
if self.file_exists: # If data file exists if self.file_exists: # If data file exists
# TODO: Streamline this bit
logging.info("Opening from file {}".format(self.file)) logging.info("Opening from file {}".format(self.file))
with open(self.file, 'rb') as f: with open(self.file, 'rb') as f:
d = io.BytesIO(f.read()) # Load bytes from file d = io.BytesIO(f.read()) # Load bytes from file
@ -189,7 +188,7 @@ class StreamObject(object):
def thumbnail(self) -> io.BytesIO: def thumbnail(self) -> io.BytesIO:
# If no thumbnail exists, try and make one # If no thumbnail exists, try and make one
if not self.thumb_bytes: if not self.thumb_bytes:
print("Building thumbnail") logging.info("Building thumbnail")
if self.format.upper() in pil_formats: if self.format.upper() in pil_formats:
im = Image.open(self.data) im = Image.open(self.data)
im.thumbnail(thumbnail_size) im.thumbnail(thumbnail_size)
@ -207,7 +206,6 @@ class StreamObject(object):
def load_file(self) -> bool: def load_file(self) -> bool:
"""Load data stored on disk to the in-memory stream.""" """Load data stored on disk to the in-memory stream."""
if self.file_exists: # If data file exists if self.file_exists: # If data file exists
# TODO: Streamline this bit
with open(self.file, 'rb') as f: with open(self.file, 'rb') as f:
self.stream = io.BytesIO(f.read()) # Load bytes from file self.stream = io.BytesIO(f.read()) # Load bytes from file
self.stream.seek(0) # Rewind data bytes again self.stream.seek(0) # Rewind data bytes again