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

Make latest_scan_name a property

Browse source
This commit is contained in:
Richard Bowman 2024-01-10 20:51:50 +00:00
parent 9ce52c2845
commit 8fb70bf43a
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/openflexure_microscope_server/things/smart_scan.py
View file

@ -307,6 +307,12 @@ class SmartScanThing(Thing):
# If the working directory is `/var/openflexure` this will result # If the working directory is `/var/openflexure` this will result
# in scans being saved at `/var/openflexure/scans/` # in scans being saved at `/var/openflexure/scans/`
return "scans" return "scans"
_latest_scan_name = None
@thing_property
def latest_scan_name(self) -> Optional[str]:
"""The name of the last scan to be started."""
return self._latest_scan_name
def scan_folder_path(self, scan_name: Optional[str]=None): def scan_folder_path(self, scan_name: Optional[str]=None):
"""The path to the scan folder with a given name""" """The path to the scan folder with a given name"""
@ -324,7 +330,7 @@ class SmartScanThing(Thing):
folder_path = os.path.join(self.scans_folder_path, f"scan_{j:06}") folder_path = os.path.join(self.scans_folder_path, f"scan_{j:06}")
if not os.path.exists(folder_path): if not os.path.exists(folder_path):
os.makedirs(folder_path) os.makedirs(folder_path)
self.latest_scan_name = os.path.basename(folder_path) self._latest_scan_name = os.path.basename(folder_path)
return folder_path return folder_path
raise FileExistsError("Could not create a new scan folder: all names in use!") raise FileExistsError("Could not create a new scan folder: all names in use!")