Commit graph

2989 commits

Author SHA1 Message Date
Joe Knapper
8799ebbaab csm info in webapp tab 2025-05-14 19:03:57 +01:00
Joe Knapper
04891f3721 Merge branch 'gui-logging' into 'v3'
Lazier regex for finding logs with square brackets

See merge request openflexure/openflexure-microscope-server!230
2025-05-14 17:16:22 +00:00
jaknapper
a1ef332e31 Set regexp equal to new format 2025-05-14 16:36:16 +01:00
Joe Knapper
4f8e508dd5 Apply 1 suggestion(s) to 1 file(s)
Co-authored-by: Julian Stirling <julian@julianstirling.co.uk>
2025-05-14 15:12:17 +00:00
Julian Stirling
457d68b63c Merge branch 'use-numpy2' into 'v3'
Use NumPy v2 and new wheel for opencv

See merge request openflexure/openflexure-microscope-server!258
2025-05-14 12:37:06 +00: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
747bc3d79a Narrower scan tabs 2025-05-14 11:17:44 +01:00
jaknapper
a5d85a7d9e Layout improvements and stitch info in scan tab 2025-05-13 17:08:43 +01:00
jaknapper
3eea4bbaf6 Log each line individually to ensure line breaks 2025-05-13 17:08:09 +01:00
jaknapper
e1110bfe5d Removed border from logo svg 2025-05-13 17:07:51 +01:00
Joe Knapper
1c0220309c Merge branch 'update-data' into 'v3'
Update scan data JSON at end of scan

Closes #365

See merge request openflexure/openflexure-microscope-server!259
2025-05-13 14:52:47 +00: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
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
Julian Stirling
51346e45fe Update dependencies to use new OpenCV wheel compiled against numpy v2 2025-05-13 09:03:53 +01:00
jaknapper
3c93a56c74 Updated json at end 2025-05-12 18:53: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
Joe Knapper
97beb9147b Merge branch 'remove_autofocus_test' into 'v3'
Remove autofocus test

See merge request openflexure/openflexure-microscope-server!255
2025-05-08 17:02:03 +00: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
Joe Knapper
ee190ec66b Merge branch 'cleanup-zipping' into 'v3'
Cleanup zipping

See merge request openflexure/openflexure-microscope-server!248
2025-05-07 19:52:55 +00: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
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