Commit graph

1150 commits

Author SHA1 Message Date
Julian Stirling
7ba2c03f61 Use us not ns for picamera timestamp and fix descriptor typing 2026-07-10 10:19:43 +01:00
Julian Stirling
f85361ae67 Subclass the mjpegstream descriptor 2026-07-10 09:48:13 +01:00
Julian Stirling
ad7b0d8da8 Record timestamp when adding frames to stream 2026-07-10 09:39:09 +01:00
jaknapper
bfa5183c30 Format log history for fallback server 2026-07-09 11:51:10 +01:00
Joe Knapper
7b7c5f932e Convert log to string for fallback server 2026-07-09 11:49:54 +01:00
Joe Knapper
ad3b579829 mypy 2026-07-09 11:49:54 +01:00
Joe Knapper
77781d5c4d Add invocation ID and logger name to JSON log
Update typehint
Update docstring
2026-07-09 11:49:54 +01:00
Julian Stirling
6b67078129 Store logs as dict on server, and send as json, rather than regex from str
Closes #321
2026-07-09 11:49:54 +01:00
Julian Stirling
274f698fab Add z-direction calibration action to sangaboard 2026-07-07 16:24:56 +01:00
jaknapper
f68515b17d Use calibration_required property to conditionally render z cal step 2026-07-07 16:24:56 +01:00
Joe Knapper
08f91854a9 Merge branch 'logging-groups' into 'v3'
Add invocation ID to log message if available

See merge request openflexure/openflexure-microscope-server!647
2026-07-07 15:17:25 +00:00
Joe Knapper
abafc012e1 Remove invocation ID from console log 2026-07-07 15:38:31 +01:00
Joe Knapper
013341272e Only format file log, add tests 2026-07-07 14:48:04 +01:00
Joe Knapper
e42aaf2547 Add invocation ID to log message if available 2026-07-07 14:27:18 +01:00
Joe Knapper
dcf5751310 Merge branch 'live-scan-details' into 'v3'
Return more live scan details for the UI

See merge request openflexure/openflexure-microscope-server!641
2026-07-06 14:03:58 +00:00
Julian Stirling
543433f31e Apply suggestions from code review of branch live-scan-details
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
2026-07-04 21:52:31 +00:00
Julian Stirling
90f106c87d Change the classes for gallery cards information to be XxxGalleryInfo
ScanInfo -> ScanGalleryInfo
CaptureInfo -> CaptureGalleryInfo - note there were two classes
called CaptureInfo, only one has been changed to deduplicate the names
2026-07-02 16:38:18 +01:00
Julian Stirling
d25ebabc77 Update unit tests for new cancel behaviour 2026-07-02 16:27:51 +01:00
Julian Stirling
26a2e1a582 Type narrowing for mypy 2026-07-02 16:02:23 +01:00
Julian Stirling
18e3978134 Send more data back from smart scan to enable if a zip was created 2026-07-02 15:17:22 +01:00
Julian Stirling
1aed597f9c Smart scan return cancelled if cancelled before stitching starts. 2026-07-02 15:17:22 +01:00
Julian Stirling
d7421ccea5 Merge branch 'stitching-cancel' into 'v3'
Adjust catching of InvocationCancelledError so stiching reports as cancelled

See merge request openflexure/openflexure-microscope-server!637
2026-07-02 14:17:12 +00:00
Julian Stirling
6db8fac613 Apply suggestions from code review of branch stitching-cancel
Co-authored-by: Richard Bowman <richard.bowman@cantab.net>
2026-07-02 13:54:55 +00:00
Julian Stirling
c146b89e74 Adjust catching of InvocationCancelledError so stiching reports as cancelled
Also stop stitching scans that error. This is a legacy from regular errors
2026-06-30 20:33:41 +01:00
Joe Knapper
f35ad17449 Merge branch 'stitching-two' into 'v3'
Stitch 2 images

See merge request openflexure/openflexure-microscope-server!630
2026-06-30 17:31:00 +00:00
Joe Knapper
8f40f4d4e4 Merge branch 'rename-rom-thing' into 'v3'
Change RangeofMotionThing to StageMeasureThing

See merge request openflexure/openflexure-microscope-server!626
2026-06-29 14:45:28 +00:00
Julian Stirling
06a3a5a92e Apply suggestions from code review of branch rename-rom-thing
Co-authored-by: Chish36 <b.chisholm2002@gmail.com>
2026-06-29 14:16:54 +00:00
Julian Stirling
bd01abc7d1 Apply suggestions from code review of branch rename-rom-thing
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
2026-06-29 13:53:13 +00:00
Julian Stirling
c128ecfcae Apply suggestions from code review of branch rename-rom-thing 2026-06-29 11:55:57 +00:00
Joe Knapper
5811631c4f Stitch 2 images 2026-06-29 12:24:37 +01:00
Julian Stirling
6a571616c9 Change RangeofMotionThing to StageMeasureThing
Also changing the data tracker and name.
2026-06-25 19:53:53 +01:00
Julian Stirling
2dcd386661 Add way for gallery providers to specify bulk actions. 2026-06-25 17:01:07 +01:00
Julian Stirling
c77cef1d9c Improve testing of gallery and behaviour if card data not set for a gallery provider 2026-06-25 10:28:02 +01:00
Julian Stirling
c4ae7f7c90 Only delete selected data types from gallery button. 2026-06-24 17:55:54 +01:00
Julian Stirling
a5828fbf41 Add filtering to gallery 2026-06-24 17:55:54 +01:00
Julian Stirling
d31d1154cc Apply suggestions from code review of branch image-capture
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
2026-06-24 11:35:41 +01:00
Julian Stirling
0e24bb01f4 Add better testing for camera gallery functions 2026-06-23 15:12:38 +00:00
Julian Stirling
03d74bb044 Improve gallery tests and fix behaviour if a provider errors 2026-06-23 15:12:38 +00:00
Julian Stirling
cc6caa39d7 Gallery can delete all data. 2026-06-23 15:12:38 +00:00
Julian Stirling
5a07721fc2 Start showing images in gallery (requires tidy) 2026-06-23 15:12:38 +00:00
Julian Stirling
4d5fd0b698 Provide an API endpoint for camera snapshots rather than relying on legacy. 2026-06-21 13:41:29 +01:00
Joe Knapper
9b12d5ca52 Merge branch 'dots-in-dirs' into 'v3'
Allow dots within filepaths if not trailing.

See merge request openflexure/openflexure-microscope-server!606
2026-06-19 10:47:52 +00:00
Beth Probert
05b802b53e Fix docstring for document generation 2026-06-17 17:11:47 +01:00
Beth Probert
cf6fd4ccea Update to cover new logic. Updatee READMEs and Guides with --debug arg information 2026-06-17 16:59:43 +01:00
Beth Probert
b1202723a1 Fix ruff
Add debug test

Add info log message for sanity

Add more useful logs

Edit configure_logging to change OFM level to debug if set in CLI

Update log message

Fix boot and int mix up

Fix string

Change string

Update logging string again

try changing OFM handler level

Change log slice

Fix syntax error

Add in OFMHandler logic, update webapp to show in logging tab and fix ruff
2026-06-17 16:29:50 +01:00
Beth Probert
b235de39f6 Update customise_server to poll the debug flag in the LT server instead of re-reading the value from CLI arguments. 2026-06-17 12:22:12 +01:00
Julian Stirling
071d62e8a0 Apply suggestions from code review of branch camera_modes
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
2026-06-05 16:58:35 +01:00
Julian Stirling
bc7204f554 Ensure camera controls are read from the camera when changing stream 2026-06-05 16:58:35 +01:00
Julian Stirling
c7d84e2674 Fix HQ camera capture and streaming modes. 2026-06-05 16:58:35 +01:00
Julian Stirling
2faf324a59 Use quick capture for CSM 2026-06-05 16:58:35 +01:00