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

Only use exif if supported format

Browse source
This commit is contained in:
Joel Collins 2019-02-18 11:48:56 +00:00
parent 05f52bbdeb
commit ab70a3857c
1 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
openflexure_microscope/camera/capture.py
View file

@ -11,8 +11,9 @@ import atexit
import piexif import piexif
pil_formats = ['JPG', 'JPEG', 'PNG', 'TIF', 'TIFF'] PIL_FORMATS = ['JPG', 'JPEG', 'PNG', 'TIF', 'TIFF']
thumbnail_size = (200, 150) EXIF_FORMATS = ['JPG', 'JPEG', 'TIF', 'TIFF']
THUMBNAIL_SIZE = (200, 150)
BASE_CAPTURE_PATH = os.path.join(os.path.expanduser('~'), 'micrographs') #: str: Base path to store all captures BASE_CAPTURE_PATH = os.path.join(os.path.expanduser('~'), 'micrographs') #: str: Base path to store all captures
TEMP_CAPTURE_PATH = os.path.join(BASE_CAPTURE_PATH, 'tmp') #: str: Base path to store all temporary captures (automatically emptied) TEMP_CAPTURE_PATH = os.path.join(BASE_CAPTURE_PATH, 'tmp') #: str: Base path to store all temporary captures (automatically emptied)
@ -65,6 +66,7 @@ def capture_from_dict(capture_dict):
Args: Args:
capture_dict (dict): Dictionary containing capture information capture_dict (dict): Dictionary containing capture information
""" """
global EXIF_FORMATS
capture = CaptureObject() # Create a placeholder capture capture = CaptureObject() # Create a placeholder capture
@ -73,7 +75,11 @@ def capture_from_dict(capture_dict):
capture.split_file_path(capture.file) capture.split_file_path(capture.file)
capture.temporary = capture_dict['temporary'] capture.temporary = capture_dict['temporary']
md_exif = pull_usercomment_dict(capture.file) if capture.format in EXIF_FORMATS:
md_exif = pull_usercomment_dict(capture.file)
else:
md_exif = {}
md_database = capture_dict['metadata'] md_database = capture_dict['metadata']
# Populate capture parameters # Populate capture parameters
@ -301,10 +307,11 @@ class CaptureObject(object):
def save_metadata(self) -> None: def save_metadata(self) -> None:
""" """
Save metadata to exif Save metadata to exif, if supported
""" """
global EXIF_FORMATS
if self.file_exists: if self.format in EXIF_FORMATS and self.file_exists:
logging.debug("Writing exif data to capture file") logging.debug("Writing exif data to capture file")
# Extract current Exif data # Extract current Exif data
exif_dict = piexif.load(self.file) exif_dict = piexif.load(self.file)
@ -405,14 +412,14 @@ class CaptureObject(object):
""" """
Returns a thumbnail of the capture data, for supported image formats. Returns a thumbnail of the capture data, for supported image formats.
""" """
global thumbnail_size global THUMBNAIL_SIZE
# 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:
logging.info("Building thumbnail") logging.info("Building thumbnail")
self.thumb_bytes = io.BytesIO() self.thumb_bytes = io.BytesIO()
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)
im.save(self.thumb_bytes, self.format) im.save(self.thumb_bytes, self.format)
self.thumb_bytes.seek(0) self.thumb_bytes.seek(0)
else: else: