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

Regex as global

Browse source
This commit is contained in:
jaknapper 2025-05-07 11:26:49 +01:00
parent 30ff796833
commit f5265b262e
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -42,6 +42,8 @@ BackgroundDep = direct_thing_client_dependency(
BackgroundDetectThing, "/background_detect/" BackgroundDetectThing, "/background_detect/"
) )
IMAGE_REGEX = re.compile(r"-?[0-9]+_-?[0-9]+\.jpeg$")
def unpack_autofocus(scan_data): def unpack_autofocus(scan_data):
"""Extract z, sharpness data from a move_and_measure call """Extract z, sharpness data from a move_and_measure call
@ -860,8 +862,7 @@ class SmartScanThing(Thing):
images_folder = os.path.join(path, IMG_DIR_NAME) images_folder = os.path.join(path, IMG_DIR_NAME)
if os.path.isdir(images_folder): if os.path.isdir(images_folder):
folder_contents = os.listdir(images_folder) folder_contents = os.listdir(images_folder)
regexp = re.compile(r"[-]?[0-9]+_[-]?[0-9]+\.jpeg") scan_images = [x for x in folder_contents if IMAGE_REGEX.search(x)]
scan_images = [x for x in folder_contents if regexp.search(x)]
number_of_images = len(scan_images) number_of_images = len(scan_images)
else: else:
number_of_images = 0 number_of_images = 0