Commit graph

587 commits

Author SHA1 Message Date
Julian Stirling
3b89a499d0 Merge branch 'log-summary' into 'v3'
Use min-height with clamping to preserve space without truncating early

Closes #818

See merge request openflexure/openflexure-microscope-server!654
2026-07-13 22:34:45 +00:00
Joe Knapper
2d0d91773b Add margin to checkbox to prevent overlap with text on right, remove spaces 2026-07-10 16:26:50 +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
3440da6f8f Use min-height with clamping to preserve space without truncating early 2026-07-09 15:17:15 +01:00
jaknapper
66e3e23812 Update js test with new log JSON 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
65530f0406 Apply suggestions from code review of branch csm-skip-button-fix 2026-07-08 09:20:09 +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
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
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
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
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
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
cae5a03922 Add "scanning" or "stitching" to the cancel button in smart scan 2026-07-02 15:17:22 +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
Joe Knapper
cae5ffa29b Merge branch 'reset-to-default' into 'v3'
Reset to default option for properties

Closes #574

See merge request openflexure/openflexure-microscope-server!640
2026-07-02 09:40:08 +00:00
Julian Stirling
6401b635fe Apply suggestions from code review of branch reset-to-default
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
2026-07-02 09:30:04 +00:00
Julian Stirling
2c7910da60 improve css naming for unstyled links 2026-07-02 10:06:53 +01:00
Julian Stirling
f89c4795ab Apply suggestions from code review of branch reset-to-default
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
2026-07-02 08:43:37 +00:00
Julian Stirling
697a121275 Consolidate property control menu into own component 2026-07-01 14:58:33 +01:00
Julian Stirling
a2ebed1006 Add a mini menu, make sync button a generic button, and allow reseting properties 2026-07-01 14:14:27 +01:00
Julian Stirling
ace42bcf2e Add visual feedback that properties have changed from default 2026-07-01 12:17:19 +01:00
Julian Stirling
a846039f74 Merge branch 'cal-wiz-popups' into 'v3'
Add calibration log to CSM pane of cal wizard

See merge request openflexure/openflexure-microscope-server!631
2026-07-01 10:10:28 +00:00
Julian Stirling
20d9a6d0e4 Merge branch 'error-log-summary' into 'v3'
Reduce spacing in action log error summary to prevet cut-off

Closes #811

See merge request openflexure/openflexure-microscope-server!638
2026-07-01 10:06:08 +00:00
Julian Stirling
524c04e31b Merge branch 'action-modal' into 'v3'
Stop showing cancel modals on action button by default

Closes #809

See merge request openflexure/openflexure-microscope-server!632
2026-07-01 10:05:14 +00:00
Julian Stirling
b9fe7961ab Reduce spacing in action log error summary to prevet cut-off 2026-06-30 21:03:31 +01:00
Julian Stirling
2ffd2378b9 Add log to CSM pane of cal wizard rather than use second pop-up 2026-06-30 20:10:16 +01:00
Julian Stirling
6148e49282 Prevent calibration navigation during actions 2026-06-30 20:10:14 +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
Julian Stirling
0eea10f2b0 Stop showing cancel modals on action button my default 2026-06-30 17:20:14 +00:00
Joe Knapper
59618ccfbf Action button notification only includes name if given 2026-06-30 13:03:00 +01:00