Commit graph

2950 commits

Author SHA1 Message Date
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
666dced86d Update the GUI download links to point to new download_zip function 2025-05-07 20:21:03 +01:00
Joe Knapper
2c8ac1dffc Merge branch 'stacking_Thing' into 'v3'
z stacking Thing

See merge request openflexure/openflexure-microscope-server!246
2025-05-07 19:15:59 +00: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
327a87e344 Merge branch 'no-tour' into 'v3'
Disable tour

See merge request openflexure/openflexure-microscope-server!238
2025-05-07 14:02:09 +00: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
cbc81c8930 Merge branch 'common-stitching-args' into 'v3'
Remove correlation only stitching, now covered by preview stitch

See merge request openflexure/openflexure-microscope-server!244
2025-05-01 15:49:07 +00: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
5bfadceeeb Pink icon for thumbnail placeholders 2025-04-23 16:13:47 +01:00
jaknapper
5ca4c824aa Remove producing thumbnail (to be added to stitching repo) 2025-04-23 14:28:41 +01:00
jaknapper
7617d31194 Errors raised as errors, not logs 2025-04-23 14:28:05 +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
Julian Stirling
257d700333 Merge branch 'shorter-move-spiral-path' into 'v3'
Add a scan path planner that prioritises shorter moves

See merge request openflexure/openflexure-microscope-server!245
2025-04-17 15:37:52 +00:00
Joe Knapper
07cbef0536 Reimplement tie breaking by distance between 2025-04-17 10:25:40 +01:00
jaknapper
c895383a83 Remove repeated moves_from_centre() code 2025-04-17 10:12:12 +01:00
jaknapper
c18472dc8a Add the import info for ScanPlanner 2025-04-17 09:56:23 +01:00
Joe Knapper
041106ebea Only open pickle file if planner was successfully generated 2025-04-17 08:48:14 +00:00
Joe Knapper
1248c2b7c8 Remove unneeded third sort key 2025-04-17 08:47:24 +00:00
Joe Knapper
871cab72f4 Apply 5 suggestion(s) to 2 file(s)
Co-authored-by: Julian Stirling <julian@julianstirling.co.uk>
2025-04-17 08:43:51 +00:00
jaknapper
2741123cf9 Looping autofocus at the start of the scan 2025-04-16 18:47:47 +01:00
Joe Knapper
c18667c973 Update pickles 2025-04-15 16:38:11 +01:00
Joe Knapper
b414697cfb Update testing for multiple sample shapes 2025-04-15 16:35:52 +01:00
jaknapper
7373424fcf Ruff formatting 2025-04-15 10:40:45 +01:00
jaknapper
ec25ae7126 Add a scan path planner that prioritises shorter moves 2025-04-14 18:49:35 +01:00
Julian Stirling
be64d4c5e0 Merge branch 'further-scan-refactor' into 'v3'
Further scan refactor

See merge request openflexure/openflexure-microscope-server!242
2025-04-14 16:07:37 +00:00