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

Fixed automatic filename generation

Browse source
This commit is contained in:
Joel Collins 2019-06-25 18:03:26 +01:00
parent f6f218be43
commit 8f2b621ce5
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
openflexure_microscope/camera/capture.py
View file

@ -203,8 +203,12 @@ class CaptureObject(object):
Construct a full file path, based on filename, folder, and file format.
Defaults to UUID.
"""
global TEMP_CAPTURE_PATH
return os.path.join(self.folder, self.filename) # Full file name by joining given folder to given name
global TEMP_CAPTURE_PATH, BASE_CAPTURE_PATH
if self.temporary:
base_dir = TEMP_CAPTURE_PATH
else:
base_dir = BASE_CAPTURE_PATH
return os.path.join(base_dir, self.filename) # Full file name by joining given folder to given name
def split_file_path(self, filepath):
"""