Commit graph

4596 commits

Author SHA1 Message Date
Julian Stirling
b0d1e2626a Merge branch 'update-docs' into 'v3'
Update path to ofm server and config file in docs

See merge request openflexure/openflexure-microscope-server!546
2026-03-17 23:34:40 +00:00
Julian Stirling
0b3ce54a7e Merge branch 'close-calibration' into 'v3'
Close calibration with confirmation

Closes #677 and openflexure-connect#40

See merge request openflexure/openflexure-microscope-server!542
2026-03-17 23:33:24 +00:00
Julian Stirling
8ee5609de4 Apply suggestions from code review of branch action-tab-2 2026-03-17 23:26:32 +00:00
Joe Knapper
fbcd7eee93 Also show modal when pressing Esc, handle multiple Escs 2026-03-17 19:09:43 +00:00
Joe Knapper
ff5eb22004 Edit README.md 2026-03-17 18:14:51 +00:00
Joe Knapper
3b2b4c33c6 Update path to ofm server and config file in docs 2026-03-17 16:55:07 +00:00
Joe Knapper
19f422b2cf Merge branch 'exposure-test' into 'v3'
Flush more frames and use a request when doing exposure time

Closes #639

See merge request openflexure/openflexure-microscope-server!540
2026-03-17 14:30:24 +00:00
Joe Knapper
798176f4be Merge branch 'empty-cal' into 'v3'
Update camera cal instructions to look through empty area if possible

Closes #580

See merge request openflexure/openflexure-microscope-server!545
2026-03-17 14:09:06 +00:00
Joe Knapper
aaee5c080a Picamera tests 2026-03-17 13:39:34 +00:00
Joe Knapper
d7872186c5 Apply suggestions from code review of branch empty-cal
Co-authored-by: Beth Probert <beth_probert@outlook.com>
2026-03-17 13:38:17 +00:00
Joe Knapper
87f5e1d1f8 Reword illumination 2026-03-17 12:52:23 +00:00
Joe Knapper
9db509de09 Extra cam alignment step with stream 2026-03-17 11:56:21 +00:00
Joe Knapper
15deaa7702 Merge branch 'codespell-git' into 'v3'
Update codespellrc to ignore ./git folder, not extension

See merge request openflexure/openflexure-microscope-server!544
2026-03-16 17:22:57 +00:00
Joe Knapper
d693cb9bdd Added explicit wording for having no coverslip 2026-03-16 16:47:48 +00:00
jaknapper
0bc6e45df9 Picamera test 2026-03-16 16:33:07 +00:00
jaknapper
8fa0217ec9 Update camera cal instructions to look through empty area if possible 2026-03-16 15:49:51 +00:00
jaknapper
a11d46777f Only drop frames when setting min exposure time 2026-03-16 15:01:10 +00:00
Joe Knapper
3b84c266b4 Apply suggestions from code review of branch exposure-test
Co-authored-by: Richard Bowman <richard.bowman@cantab.net>
2026-03-16 14:31:21 +00:00
Joe Knapper
7fa04e5dbc codespell rc to ignore ./git file, not extension 2026-03-16 12:55:41 +00:00
Joe Knapper
cf6bf8243c Close calibration with confirmation
Centre CSM button in calibration

Add the word "Data" to "No CSM available"
2026-03-13 16:33:17 +00:00
jaknapper
ae04f3b133 Drop frame drop to 2 2026-03-13 13:22:56 +00:00
jaknapper
a4aac53072 Flush more frames and use a request when doing exposure time 2026-03-13 10:48:22 +00:00
Julian Stirling
ca5c49289e Merge branch 'cchip' into 'v3'
CChip scan workflow

See merge request openflexure/openflexure-microscope-server!474
2026-03-12 18:16:52 +00:00
Joe Knapper
e5b0428740 Edit ofm_config_simulation.json 2026-03-12 17:05:15 +00:00
Joe Knapper
2675dff8dc Edit ofm_config_full.json 2026-03-12 17:04:48 +00:00
Joe Knapper
68c9f76fc0 Fix missing import 2026-03-12 16:11:41 +00:00
Joe Knapper
5ce77538d1 Fix tests now we dont do extra backlash moves 2026-03-12 14:53:55 +00:00
jaknapper
b43150c8bb Remove backlash correction from basic stack, as this is handled by move rel 2026-03-12 14:53:55 +00:00
Joe Knapper
ffb9a4d509 Add CChip workflow to scan_workflows 2026-03-12 14:53:55 +00:00
Julian Stirling
a5f95d24c7 Tweak button size at the end of the scan 2026-03-11 14:53:25 +00:00
Julian Stirling
4190899f17 Merge branch 'move-to-dev-docs' into 'v3'
Move more development information to the dev docs to minimise repitition and getting out of sync

Closes #556

See merge request openflexure/openflexure-microscope-server!529
2026-03-11 14:43:48 +00:00
Julian Stirling
bad736cc46 Split slide scan tab into action tab and seperate controls. 2026-03-11 13:43:54 +00:00
Julian Stirling
b4d6436bf3 Update action button to allow ID to be forced and to check tasks via mixin 2026-03-11 13:43:54 +00:00
Julian Stirling
d3b1081c98 Further improve the linting and formatting section of the dev docs 2026-03-11 13:08:02 +00:00
Julian Stirling
b8878d6930 Removing out of date developer doc information and improving linking 2026-03-11 12:58:35 +00:00
Julian Stirling
59eafa7802 Apply suggestions from code review of branch move-to-dev-docs
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
2026-03-11 12:38:18 +00:00
Joe Knapper
84b96809ad Merge branch 'seadragon-fix' into 'v3'
Stop closing seadragon when going full screen

Closes #718

See merge request openflexure/openflexure-microscope-server!533
2026-03-11 12:29:35 +00:00
Julian Stirling
36111f4da3 Merge branch 'stream-rder' into 'v3'
Handle scan settings, then change stream, then pre-scan procedure when scanning

See merge request openflexure/openflexure-microscope-server!442
2026-03-11 11:52:03 +00:00
Joe Knapper
2909194d61 Merge branch 'dynamic-ui' into 'v3'
Increase number of UI elements that can be specified in the server

Closes #508 and #644

See merge request openflexure/openflexure-microscope-server!530
2026-03-11 11:45:51 +00:00
Julian Stirling
842d18ecdf Apply suggestions from code review of branch dynamic-ui
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
2026-03-11 11:00:33 +00:00
Joe Knapper
84f9fc9aa7 Consistent spacing around MD tests 2026-03-11 10:35:09 +00:00
Joe Knapper
2e1066477e Add parser.path to html sanitiser, fixing tests 2026-03-11 10:24:40 +00:00
Joe Knapper
fd0c0bd277 Add failing URL tests 2026-03-11 10:23:26 +00:00
Julian Stirling
3cb70278dd Remove the scan modal hide handler when unmounted 2026-03-11 09:37:58 +00:00
Julian Stirling
1090e693d4 Prevent scan modal closing on fullscreen close, and pin filter to fixed reference 2026-03-11 09:30:45 +00:00
Julian Stirling
c4d0c0e9da Explicit header, text and bullet blocks rather than one HTML block in ui spec 2026-03-10 15:25:37 +00:00
Julian Stirling
85ebfef44a Improve and test html sanitisation 2026-03-10 15:25:37 +00:00
Julian Stirling
0bfec5d046 Apply suggestions from code review of branch dynamic-ui
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
2026-03-10 15:25:37 +00:00
Julian Stirling
88da4a18d9 Update unit tests 2026-03-10 15:25:37 +00:00
Julian Stirling
eccf26851e Reintroduce recactive button state for background detect 2026-03-10 15:25:37 +00:00