Commit graph

221 commits

Author SHA1 Message Date
jaknapper
4a44dceac6 More clear variable name, use _delete_scan to avoid calling fastapi-endpoint in loops 2025-05-20 16:36:57 +01:00
jaknapper
19d72bef1c Error handling in _delete_scan(), which is now handled in GUI main.js 2025-05-14 16:11:02 +01:00
jaknapper
0e3c71b958 Removed from finally block 2025-05-13 12:39:04 +01:00
jaknapper
3a45c68ef3 Try Except around deleting scans to check for PermissionErrors 2025-05-13 12:23:01 +01:00
jaknapper
0df363a1be Run purge_empty_scans() at the end of each scan 2025-05-09 12:12:12 +01:00
jaknapper
2a23982330 Added purge_empty_scans() method 2025-05-08 19:44:05 +01:00
Joe Knapper
ecfa0aa479 Merge branch 'scan_coments' into 'v3'
New comments on scanning

Closes #329

See merge request openflexure/openflexure-microscope-server!256
2025-05-08 17:59:14 +00:00
Joe Knapper
cb71f32b95 Apply 1 suggestion(s) to 1 file(s) 2025-05-08 17:44:42 +00:00
Joe Knapper
973988219f Apply 1 suggestion(s) to 1 file(s)
Co-authored-by: Julian Stirling <julian@julianstirling.co.uk>
2025-05-08 17:43:49 +00:00
jaknapper
7e507be4a1 Ruff formatting 2025-05-08 18:42:10 +01:00
jaknapper
0e34ab8793 New comments on scanning 2025-05-08 18:41:32 +01:00
Joe Knapper
444c056f93 Apply 1 suggestion(s) to 1 file(s) 2025-05-08 17:30:26 +00:00
jaknapper
d2ab448732 New comments on scanning 2025-05-08 18:22:40 +01:00
jaknapper
46865b342d Remove testing focus success, use scan data autofocus dz 2025-05-08 17:32:38 +01:00
jaknapper
bdb307ca18 Remove verify_autofocus from autofocus 2025-05-08 17:32:04 +01:00
jaknapper
736b82d071 Remove logger from zipping 2025-05-07 20:35:26 +01:00
Joe Knapper
6f8e91afe7 Apply 1 suggestion(s) to 1 file(s) 2025-05-07 20:22:40 +01:00
jaknapper
b31a5e44fb Rename banned names to delayed 2025-05-07 20:22:40 +01:00
jaknapper
a9d06f7d7e Remove commented out code, unused arguments and extra logging 2025-05-07 20:22:39 +01:00
jaknapper
a88349dbfe Loop through all stitched images 2025-05-07 20:22:39 +01:00
jaknapper
aa656e4a01 Split out zip functions and copying stitched image 2025-05-07 20:22:38 +01:00
jaknapper
2205459aeb Removed z_stack Thing from rebase 2025-05-07 19:59:33 +01:00
jaknapper
673a135157 Reorganise imports 2025-05-07 19:52:21 +01:00
jaknapper
a4801ad861 Update camera thing to match upstream 2025-05-07 19:52:21 +01:00
jaknapper
6cf99d5096 Stack settings in GUI 2025-05-07 19:52:21 +01:00
jaknapper
f50580cdd0 Give sharpness monitor a descriptive name, not m 2025-05-07 19:52:20 +01:00
jaknapper
bf6437b42c Renaming z_stack features for clarity, docstring on AutofocusThing 2025-05-07 19:52:20 +01:00
jaknapper
9f39f61d03 Stacking in autofocus with temp capture Thing 2025-05-07 19:52:18 +01:00
jaknapper
dee11deec1 New capturing Thing 2025-05-07 19:51:57 +01:00
jaknapper
9b2ccea660 Don't move further after the final image of the stack 2025-05-07 19:51:57 +01:00
jaknapper
ade713b6d0 Create a stack folder and copy the middle image to image_dir 2025-05-07 19:51:57 +01:00
jaknapper
0b7a817674 Ruff formatting and removing all capturing from smart_scan 2025-05-07 19:51:55 +01:00
jaknapper
1f3211e3ee Functional z stack Thing 2025-05-07 19:49:52 +01:00
Joe Knapper
fe5db1a0f5 Merge branch 'image_count' into 'v3'
Regex to count captured images

Closes #306

See merge request openflexure/openflexure-microscope-server!253
2025-05-07 13:53:37 +00:00
Joe Knapper
88f72caed5 Merge branch 'thumbnails-in-scan-tab' into 'v3'
Thumbnails and accurate durations in scan-list tab

See merge request openflexure/openflexure-microscope-server!250
2025-05-07 13:53:34 +00:00
jaknapper
f5265b262e Regex as global 2025-05-07 11:26:49 +01:00
jaknapper
30ff796833 Regex to count captured images 2025-05-07 11:09:29 +01:00
Joe Knapper
a1be3e518f Apply 2 suggestion(s) to 1 file(s)
Co-authored-by: Julian Stirling <julian@julianstirling.co.uk>
2025-05-01 14:14:34 +00:00
jaknapper
fbbb3decdc Ruff formatting 2025-05-01 13:16:48 +00:00
jaknapper
b8ddab1ed8 Remove correlation only stitching, now covered by preview stitch 2025-05-01 13:16:48 +00:00
jaknapper
5ca4c824aa Remove producing thumbnail (to be added to stitching repo) 2025-04-23 14:28:41 +01:00
Julian Stirling
3adc34c30b Merge branch 'dont-test-focus-change' into 'v3'
Remove focus_change_acceptable test

Closes #342

See merge request openflexure/openflexure-microscope-server!249
2025-04-23 11:28:05 +00:00
Joe Knapper
c4dc357cf3 Apply 1 suggestion(s) to 1 file(s)
Co-authored-by: Julian Stirling <julian@julianstirling.co.uk>
2025-04-23 10:57:56 +00:00
Joe Knapper
283a10c560 Always move back to expected focus after failed autofocus 2025-04-23 09:15:54 +00:00
Julian Stirling
0ac455bf89 Merge branch 'autofocus-at-start' into 'v3'
Looping autofocus at the start of the scan

See merge request openflexure/openflexure-microscope-server!247
2025-04-23 08:10:21 +00:00
jaknapper
91057f164a Thumbnails and accurate durations in scan-list tab 2025-04-22 19:02:29 +01:00
jaknapper
3bcc71304e Fixed focused path tracking, move to estimated focus before autofocus 2025-04-22 14:33:27 +01:00
jaknapper
7cb1a3980e Remove focus_change_acceptable test, autofocus from centre 2025-04-17 17:20:40 +01:00
jaknapper
5d8a1073b2 Remove focus_change_acceptable 2025-04-17 17:02:39 +01:00
Joe Knapper
07cbef0536 Reimplement tie breaking by distance between 2025-04-17 10:25:40 +01:00