rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4912 commits 1 branch 0 tags 24 MiB
Commit graph

4912 commits

This branch
This branch
All branches
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
Joe Knapper
d26b93e1be Merge branch 'conditional-log' into 'v3' 
Action log: only show log summary once first message arrives

Closes #817

See merge request openflexure/openflexure-microscope-server!655
 2026-07-09 17:12:17 +00:00
Joe Knapper
b02f5c8dc1 Only hide expand button when no logs, keeping spacing 2026-07-09 17:32:33 +01:00
Julian Stirling
78c777122b Merge branch 'cal-wiz-illumination-adjust' into 'v3' 
Cal wiz illumination adjust

Closes #797

See merge request openflexure/openflexure-microscope-server!651
 2026-07-09 15:51:21 +00:00
Joe Knapper
ee63ce6fc7 Only show collapsed log and summary once first message arrives 2026-07-09 16:16:37 +01:00
Joe Knapper
4093c4f7f7 Merge branch 'send-json-logs' into 'v3' 
Store logs as dict on server, and send as json, rather than regex from str

Closes #321

See merge request openflexure/openflexure-microscope-server!234
 2026-07-09 11:11:49 +00:00
jaknapper
bfa5183c30 Format log history for fallback server 2026-07-09 11:51:10 +01:00
jaknapper
66e3e23812 Update js test with new log JSON 2026-07-09 11:49:54 +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
b7c0c60e63 Adjust the before camera camera calibration step now illumination is seperate. 2026-07-08 17:01:05 +01:00
Julian Stirling
a1894c0dbf Add an illumination adjustment step to calibration. 2026-07-08 16:58:22 +01:00
Joe Knapper
330db19827 Merge branch 'cross-env-js-tests' into 'v3' 
Make unit tests cross OS

Closes #824

See merge request openflexure/openflexure-microscope-server!650
 2026-07-08 15:09:13 +00:00
Joe Knapper
512fdcbac5 Make unit tests cross OS 2026-07-08 15:43:38 +01:00
Joe Knapper
d0c1b4191d Merge branch 'csm-skip-button-fix' into 'v3' 
Ensure CSM calibration pane updates from Skip to Next on successful calibration.

Closes #822

See merge request openflexure/openflexure-microscope-server!649
 2026-07-08 09:30:30 +00:00
Joe Knapper
65530f0406 Apply suggestions from code review of branch csm-skip-button-fix 2026-07-08 09:20:09 +00:00
Julian Stirling
95b0474300 Merge branch 'css-docs' into 'v3' 
CSS dev docs

Closes #804

See merge request openflexure/openflexure-microscope-server!645
 2026-07-08 09:11:51 +00:00
Julian Stirling
37cba4d074 Apply suggestions from code review of branch css-docs 
Co-authored-by: Beth Probert <beth_probert@outlook.com>
 2026-07-07 18:03:26 +00:00
Julian Stirling
22c1394aad Ensure CSM calibration pane updates from Skip to Next on successful calibration. 2026-07-07 18:47:35 +01:00
Julian Stirling
6e19c73dd3 Merge branch 'stage-dir-calibrate' into 'v3' 
Stage direction calibrate

Closes #626 and #647

See merge request openflexure/openflexure-microscope-server!633
 2026-07-07 17:28:11 +00:00
Julian Stirling
304fd6dfe3 Fix python unit tests for extra sangaboard action and setting 2026-07-07 16:24:56 +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
5875abbceb Lint 2026-07-07 16:24:56 +01:00
Joe Knapper
dbf02e6757 Apply suggestions from code review of branch stage-dir-calibrate 
Co-authored-by: Julian Stirling <julian@julianstirling.co.uk>
 2026-07-07 16:24:56 +01:00
Joe Knapper
5ef292cfaa Remove action button 2026-07-07 16:24:56 +01:00
Joe Knapper
11f2482ab1 Add images to calibration step 2026-07-07 16:24:55 +01:00
Joe Knapper
2b03879bcf Capitalise file name 2026-07-07 16:24:55 +01:00
Joe Knapper
fa55b068aa Just say clockwise / anti clockwise 2026-07-07 16:24:55 +01:00
Joe Knapper
e291e2ef52 Also check if stage exists 2026-07-07 16:24:55 +01:00
Joe Knapper
fb96568df4 Linting 2026-07-07 16:24:55 +01:00
Joe Knapper
f77542110e Calibration wizard asks about motor direction 2026-07-07 16:24:55 +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
ece2eaa514 Merge branch 'gallery-views' into 'v3' 
Gallery views

See merge request openflexure/openflexure-microscope-server!646
 2026-07-07 13:36:16 +00:00
Joe Knapper
e42aaf2547 Add invocation ID to log message if available 2026-07-07 14:27:18 +01:00
Julian Stirling
1f7a8a1a4e CSS tweaks and show warnings for scan thumbnails if preview is unavailable 2026-07-07 14:06:01 +01:00
Julian Stirling
ba11f65219 Update miniMenu to allow selector to be a button, and use for filtering the gallery 2026-07-07 10:53:43 +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
6b17a61d55 Add thumbail only option to gallery card 2026-07-06 10:01:34 +01:00
Julian Stirling
aa10d52487 right padding in gallery nav to match button gap at all screen sizes 2026-07-06 09:34:15 +01:00
Julian Stirling
4eec94d573 Remove complexity in gallery nav HTML 2026-07-06 09:26:10 +01:00
Julian Stirling
7fbf56eca3 A little bit of documentation about CSS and the hook inverse 2026-07-04 23:15:57 +01: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
Joe Knapper
eac055d352 Merge branch 'deduplicate-CaptureInfo' into 'v3' 
Change the classes for gallery cards information to be XxxGalleryInfo

Closes #814

See merge request openflexure/openflexure-microscope-server!643
 2026-07-02 18:25:10 +00:00