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

Simplified creation of new capture objects

Browse source
This commit is contained in:
Joel Collins 2019-04-26 18:26:27 +01:00
parent 28561433a0
commit ea44bbefd2
2 changed files with 37 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

16
openflexure_microscope/camera/base.py
View file

@ -316,18 +316,20 @@ class BaseCamera(object):
if not filename:
filename = generate_numbered_basename(self.images)
logging.debug(filename)
filename = "{}.{}".format(filename, fmt)
# Generate folder
base_folder = self.paths['image_tmp'] if temporary else self.paths['image']
folder = os.path.join(base_folder, folder)
# Generate file path
filepath = os.path.join(folder, filename)
# Create capture object
output = CaptureObject(
write_to_file=write_to_file,
temporary=temporary,
filename=filename,
folder=folder,
fmt=fmt)
filepath=filepath)
# Update capture list
self.shunt_captures(self.images)
@ -360,18 +362,20 @@ class BaseCamera(object):
if not filename:
filename = generate_numbered_basename(self.videos)
logging.debug(filename)
filename = "{}.{}".format(filename, fmt)
# Generate folder
base_folder = self.paths['video_tmp'] if temporary else self.paths['video']
folder = os.path.join(base_folder, folder)
# Generate file path
filepath = os.path.join(folder, filename)
# Create capture object
output = CaptureObject(
write_to_file=write_to_file,
temporary=temporary,
filename=filename,
folder=folder,
fmt=fmt)
filepath=filepath)
# Update capture list
self.shunt_captures(self.videos)