Commit graph

3264 commits

Author SHA1 Message Date
jaknapper
26163dc97e Added a new way to capture full res JPEGs, need to do a comparison of results 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
46458ca8a1 Create a stack folder and copy the middle image to image_dir 2025-06-23 11:17:45 +01:00
jaknapper
a1784941fe Ruff formatting and removing all capturing from smart_scan 2025-06-23 11:17:45 +01:00
jaknapper
603b9c7d16 Functional z stack Thing 2025-06-23 11:17:45 +01:00
Julian Stirling
c70b487a1f Automatically create HTML coverage report each time PyTest runs 2025-06-23 11:00:10 +01:00
Joe Knapper
4c72098536 Merge branch 'shutdown-timeout' into 'v3'
Add a timeout when shutting down the server.

See merge request openflexure/openflexure-microscope-server!297
2025-06-20 16:35:37 +00:00
Joe Knapper
cc506b8794 Merge branch 'simulation-axes' into 'v3'
Git ignore openflexure/ dir

See merge request openflexure/openflexure-microscope-server!298
2025-06-20 16:32:37 +00:00
Joe Knapper
9dac080566 Fixed merge conflict 2025-06-20 15:14:35 +00:00
Joe Knapper
b05e3bee63 added openflexure/ to .gitignore 2025-06-20 16:11:07 +01:00
jaknapper
f6cc7403e3 Update test_smart_spiral_first_few_pos() as smart stack chooses a different z_estimate 2025-06-20 15:01:09 +01:00
jaknapper
a001da0bcb Restore closest_focus_site function 2025-06-20 15:01:09 +01:00
Joe Knapper
d1ed7ec797 Apply suggestions from code review of branch fast-stack 2025-06-20 11:26:58 +00:00
Joe Knapper
006d3b2a7b Apply suggestions from code review of branch fast-stack
Co-authored-by: Beth Probert <beth_probert@outlook.com>
2025-06-20 11:23:14 +00:00
jaknapper
ce33b94aab Capture as a Raw dependency to use methods that aren't actions 2025-06-20 12:19:07 +01:00
Julian Stirling
cdf23bc403 Add a timeout when shutting down the server.
The browser needs to be closed for graceful shutdown. If the browser
is left open the microscope may never shut down as it is waiting on
the uvicorn process to finish. This causes potential SD card issues.

This forces the server to force shutdown if it doesn't exit gracefully in
2 seconds.
2025-06-19 16:25:43 -04:00
jaknapper
6cf2f4d8c3 Typehints and docstrings in z_stack 2025-06-19 14:58:16 +01:00
jaknapper
00321d761d Update docstring for nearby focus site 2025-06-19 14:57:27 +01:00
jaknapper
6acfbaefd6 Split up z stack function 2025-06-18 18:36:21 +01:00
jaknapper
c0677858a1 Scan planner finds lowest neighbour, not most recent 2025-06-18 15:40:21 +01:00
Joe Knapper
b01032be99 Merge branch 'update-issue-templates' into 'v3'
Update issue templates

See merge request openflexure/openflexure-microscope-server!295
2025-06-17 16:23:43 +00:00
Julian Stirling
dd24a3863d Apply suggestions from code review of branch update-issue-templates
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
2025-06-17 15:58:45 +00:00
Julian Stirling
f7545c6d8d Update issue templates 2025-06-17 11:18:33 -04:00
jaknapper
1d4bb7363f Images to test control in GUI 2025-06-17 14:34:42 +01:00
jaknapper
e8c4103bb0 Remove unneeded logging 2025-06-17 14:34:42 +01:00
jaknapper
f363ec0eff Docstring for test_stack 2025-06-17 14:34:42 +01:00
jaknapper
dbb65d55b5 Use scan autofocus dz 2025-06-17 14:34:42 +01:00
jaknapper
cdd603d751 Capture the full stack requested 2025-06-17 14:34:42 +01:00
jaknapper
0671f2d1be Backlash correction as global, more comments 2025-06-17 14:34:42 +01:00
jaknapper
712f524414 Looping autofocus on failed smart stack 2025-06-17 14:34:42 +01:00
jaknapper
3e164102f6 A stack that tests whether the sharpest image is towards the middle 2025-06-17 14:34:42 +01:00
Julian Stirling
67e8b19603 Merge branch 'remove-nav-spinners-firefox' into 'v3'
Remove numerical input spinners for x,y,z settings in Firefox

See merge request openflexure/openflexure-microscope-server!288
2025-06-16 12:15:42 +00:00
Julian Stirling
c43b7cb8b4 Merge branch 'more-checkers' into 'v3'
Enable more lint checkers

See merge request openflexure/openflexure-microscope-server!290
2025-06-12 11:56:29 +00:00
Julian Stirling
37bb9635ad Apply 2 suggestion(s) to 2 file(s)
Co-authored-by: Beth Probert <beth_probert@outlook.com>
2025-06-12 10:29:54 +00:00
Julian Stirling
3019e13c80 Add commented out code check to linters 2025-06-11 23:40:49 +01:00
Julian Stirling
86dad84a5a Merge branch 'correct-alpha-version-changelog' into 'v3'
Correct version name in change beta1 -> alpha1

See merge request openflexure/openflexure-microscope-server!291
2025-06-11 12:50:12 +00:00
Julian Stirling
fe26a299d5 Correct version name in change beta1 -> alpha1 2025-06-11 10:08:16 +00:00
Julian Stirling
04832892cc Chnge docstring tester from Doc to D as Doc has no effect 2025-06-10 16:07:49 +01:00
Julian Stirling
1c54d25212 Add ruff checking for unnecessary comprehensions 2025-06-10 16:07:49 +01:00
Julian Stirling
2050c2dc7c Add return checker, needed 4 fixes 2025-06-10 16:07:48 +01:00
Julian Stirling
3f0564f253 Turning on more lint checkers, warning for cameras that ignore resolution setting 2025-06-10 16:07:48 +01:00
Julian Stirling
cf80120572 Remove numerical input spinners for x,y,z settings in Firefox
Chrome/Safari/Edge etc are all set already by the
`.numeric-setting-line-input::-webkit-outer-spin-button`
and
`.numeric-setting-line-input::-webkit-inner-spin-button`

but firefox needs a different line set on the input itself see:
https://www.w3schools.com/howto/howto_css_hide_arrow_number.asp
2025-06-10 08:47:23 +01:00
Julian Stirling
6c6356bf38 Merge branch 'final-changes-for-v3.0.0-alpha1' into 'v3'
Update depedencies and changelog prior to v3.0.0-alpha1 release

Closes #398

See merge request openflexure/openflexure-microscope-server!287
2025-06-09 15:38:56 +00:00
Julian Stirling
e223405444 Tweak changelog and add MR list
Co-authored-by: Beth Probert <beth_probert@outlook.com>
Co-authored-by: William Wadsworth <w.j.wadsworth@bath.ac.uk>
2025-06-09 16:11:19 +01:00
Julian Stirling
0457978048 Update depedencies and changelog priort to v3.0.0-alpha1 release
Closes #398
2025-06-09 15:39:26 +01:00
Joe Knapper
ae2ec1864f Merge branch 'config-scan-dir' into 'v3'
Add scan directory to json config

Closes #393

See merge request openflexure/openflexure-microscope-server!283
2025-06-09 13:42:27 +00:00
Julian Stirling
80b6fd088d Merge branch 'reverse_csm_order' into 'v3'
Swapped the order of CSM so y axis is completed first

See merge request openflexure/openflexure-microscope-server!285
2025-06-09 13:39:06 +00:00
Chish36
7eed48ed26 Swapped the order of CSM so y axis is completed first 2025-06-09 13:39:06 +00:00
Julian Stirling
37960a4cc2 Merge branch 'Server-versioning' into 'v3'
Use same version number for server and webapp, add CI check

Closes #382

See merge request openflexure/openflexure-microscope-server!286
2025-06-09 12:32:41 +00:00