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

Added subdirectory support for captures

Browse source
This commit is contained in:
Joel Collins 2019-03-06 17:04:04 +00:00
parent 51ac8a0647
commit 2fe7722da6
1 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

20
openflexure_microscope/camera/base.py
View file

@ -252,7 +252,7 @@ class BaseCamera(object):
capture_list = [] capture_list = []
for capture_dict in capture_dict_list: for capture_dict in capture_dict_list:
if os.path.isfile(capture_dict['path']): if 'path' in capture_dict and os.path.isfile(capture_dict['path']):
capture_list.append(capture_from_dict(capture_dict)) capture_list.append(capture_from_dict(capture_dict))
return capture_list return capture_list
@ -283,6 +283,7 @@ class BaseCamera(object):
write_to_file: bool = False, write_to_file: bool = False,
temporary: bool = True, temporary: bool = True,
filename: str = None, filename: str = None,
folder: str = None,
fmt: str = 'jpeg'): fmt: str = 'jpeg'):
""" """
@ -300,12 +301,18 @@ class BaseCamera(object):
filename = generate_numbered_basename(self.images) filename = generate_numbered_basename(self.images)
logging.debug(filename) logging.debug(filename)
# Generate folder
if folder:
folder = os.path.join(self.paths['image'], folder)
else:
folder = self.paths['image']
# Create capture object # Create capture object
output = CaptureObject( output = CaptureObject(
write_to_file=write_to_file, write_to_file=write_to_file,
temporary=temporary, temporary=temporary,
filename=filename, filename=filename,
folder=self.paths['image'], folder=folder,
fmt=fmt) fmt=fmt)
# Update capture list # Update capture list
@ -322,6 +329,7 @@ class BaseCamera(object):
write_to_file: bool = True, write_to_file: bool = True,
temporary: bool = False, temporary: bool = False,
filename: str = None, filename: str = None,
folder: str = None,
fmt: str = 'h264'): fmt: str = 'h264'):
""" """
@ -339,12 +347,18 @@ class BaseCamera(object):
filename = generate_numbered_basename(self.videos) filename = generate_numbered_basename(self.videos)
logging.debug(filename) logging.debug(filename)
# Generate folder
if folder:
folder = os.path.join(self.paths['video'], folder)
else:
folder = self.paths['video']
# Create capture object # Create capture object
output = CaptureObject( output = CaptureObject(
write_to_file=write_to_file, write_to_file=write_to_file,
temporary=temporary, temporary=temporary,
filename=filename, filename=filename,
folder=self.paths['video'], folder=folder,
fmt=fmt) fmt=fmt)
# Update capture list # Update capture list