Commit graph

164 commits

Author SHA1 Message Date
jaknapper
17f3bbe646 Low res stream during scanning for instant high res captures 2025-06-23 11:17:46 +01:00
jaknapper
a9fdd0ea3e Wait params in captures, multiple attempts to capture 2025-06-23 11:17:46 +01:00
jaknapper
de7ffb9d1e Stream_name and capture_method args updated 2025-06-23 11:17:46 +01:00
jaknapper
132efa8033 Options for capture method, default downsampling of correlations 2025-06-23 11:17:45 +01:00
jaknapper
ab33de7ccd Capture a jpeg to disk 2025-06-23 11:17:45 +01:00
jaknapper
d8878e40da Stacking in autofocus with temp capture Thing 2025-06-23 11:17:45 +01:00
jaknapper
603b9c7d16 Functional z stack Thing 2025-06-23 11:17:45 +01:00
Julian Stirling
b45f5651ab Add scan directory to json config 2025-06-06 12:21:51 +01:00
jaknapper
a499d9230c Switch to updated "preview stitch" mode in stitching 2025-05-23 16:28:22 +01:00
jaknapper
cc3620d2ed Stitch with dzi by default, and check for dzi available in scans() 2025-05-23 16:28:21 +01:00
Julian Stirling
fe1696df28 Fix error in purge_empty_scans if the images dir hadn't been created 2025-05-23 12:49:46 +01:00
Julian Stirling
70f4304b2e Fix bug where .jpg files are not counted in scan list (only .jpeg) 2025-05-23 11:45:26 +01:00
Julian Stirling
6332c8b647 Merge branch 'openflexure-stitching-from-pip' into 'v3'
Import openflexure-stitching from pip

See merge request openflexure/openflexure-microscope-server!270
2025-05-21 10:00:48 +00:00
jaknapper
44f2435ea4 Removed stitching path as kwarg for scanning 2025-05-21 10:30:42 +01:00
Julian Stirling
c793620fcd Merge branch 'cleanup_empty_scans' into 'v3'
Added purge_empty_scans() method

Closes #370

See merge request openflexure/openflexure-microscope-server!257
2025-05-20 18:26:00 +00:00
Joe Knapper
6c8c8bf358 Apply 1 suggestion(s) to 1 file(s)
Co-authored-by: Julian Stirling <julian@julianstirling.co.uk>
2025-05-20 17:04:48 +00:00
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
Joe Knapper
1468a90c60 Merge branch 'scan_tab' into 'v3'
Scan tab updates

See merge request openflexure/openflexure-microscope-server!260
2025-05-14 11:53:19 +00:00
jaknapper
99e52bcb2f Formatting and fixing wrong variable in loop 2025-05-14 12:23:01 +01:00
Joe Knapper
251b0ca770 Apply 1 suggestion(s) to 1 file(s)
Co-authored-by: Julian Stirling <julian@julianstirling.co.uk>
2025-05-14 10:26:37 +00:00
jaknapper
3eea4bbaf6 Log each line individually to ensure line breaks 2025-05-13 17:08:09 +01:00
jaknapper
69260d1973 stitch available property, allowing GUI to only stitch when needed 2025-05-13 15:51:11 +01:00
jaknapper
a77c0f6f9d Updated wrong path to file 2025-05-13 15:28:16 +01:00
Joe Knapper
b5893bc29c Apply 1 suggestion(s) to 1 file(s)
Co-authored-by: Julian Stirling <julian@julianstirling.co.uk>
2025-05-13 12:34:50 +00:00
jaknapper
56edddd195 Data filename as global 2025-05-13 13:03:34 +01:00
jaknapper
1952e05284 Scan result in data json 2025-05-13 13:00:04 +01:00
jaknapper
9734bba23b Inputs renamed to data where appropriate 2025-05-13 12:45:55 +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
845c21c68a Move update data outside of finally block 2025-05-13 11:46:56 +01:00
jaknapper
272f050905 Move update data outside of finally block 2025-05-13 11:32:03 +01:00
jaknapper
4234c92fed Better formatting of duration as datetime timedelta without microseconds 2025-05-13 11:10:27 +01:00
jaknapper
3c93a56c74 Updated json at end 2025-05-12 18:53:05 +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
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