Commit graph

4839 commits

Author SHA1 Message Date
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
6ae8f8d970 Merge branch 'steps-to-reproduce' into 'v3'
Make steps to reproduce more visible in bug template

See merge request openflexure/openflexure-microscope-server!636
2026-06-30 21:16:27 +00:00
Julian Stirling
199a6ebfdc Apply suggestions from code review of branch steps-to-reproduce 2026-06-30 20:45:14 +00:00
Julian Stirling
aea260d47d Apply suggestions from code review of branch steps-to-reproduce 2026-06-30 20:17:30 +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
50595d6095 Reorder bug template slightly and clarify configuration questions 2026-06-30 20:54:58 +01:00
Julian Stirling
c5867b02e9 Merge branch 'jaknapper-v3-patch-43034' into 'v3'
Correct docs on running server manually on Pi to include PATH

Closes #796

See merge request openflexure/openflexure-microscope-server!635
2026-06-30 18:31:06 +00:00
Julian Stirling
ebf38f2f70 Remove level 1 headings 2026-06-30 19:23:30 +01:00
Julian Stirling
3db4b8036e Make steps to reproduce more visible in bug template 2026-06-30 19:21:14 +01:00
Julian Stirling
cacc268b02 Apply suggestions from code review of branch jaknapper-v3-patch-43034 2026-06-30 18:05:46 +00: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
afbc77e06d Apply suggestions from code review of branch stitching-two
Co-authored-by: Julian Stirling <julian@julianstirling.co.uk>
2026-06-30 17:10:57 +00:00
Julian Stirling
a18fe8b58d Merge branch 'v3-fix-csm-integration-test' into 'v3'
Provide both required arguments to `move_in_image_coordinates`

Closes #810

See merge request openflexure/openflexure-microscope-server!634
2026-06-30 16:37:35 +00:00
Joe Knapper
acbe862e72 Add -E to docs on running server manually on Pi 2026-06-30 16:00:36 +00:00
Richard Bowman
87c4a2aadf Provide both required arguments to move_in_image_coordinates
The integration test checks that moving in image coordinates fails
before the CSM thing is calibrated.
Unfortunately, it is missing the `y` argument, so it would fail either way.

This commit supplies the extra argument so that the failure should come from the right place.

It also changes the expected error to `ServerActionError` and adds a check
for the message, to verify it is due to missing calibration data.

A future version of the LabThings Client (#89) may raise a different
error if a required argument is missing, so fixing this will ensure
that upstream change doesn't break anything here.
2026-06-30 16:53:11 +01:00
Joe Knapper
59618ccfbf Action button notification only includes name if given 2026-06-30 13:03:00 +01: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
ced7826752 Update tests 2026-06-29 12:47:55 +01:00
Joe Knapper
5811631c4f Stitch 2 images 2026-06-29 12:24:37 +01:00
Joe Knapper
d2e19142df Merge branch 'gallery-sidebar' into 'v3'
Add gallery bulk actions and sidebar

See merge request openflexure/openflexure-microscope-server!625
2026-06-29 11:16:02 +00:00
Julian Stirling
57e01fa823 Add comments to global CSS for ofm-tab 2026-06-29 10:54:24 +00:00
Joe Knapper
27854eb553 Merge branch 'button-line-height' into 'v3'
Use padding rather than line height for button sizing

Closes #767

See merge request openflexure/openflexure-microscope-server!627
2026-06-28 13:34:30 +00:00
Joe Knapper
7ff40c93b8 Merge branch 'fix-temp-dir' into 'v3'
Fix temp dir path for data directories in unit tests

Closes #807

See merge request openflexure/openflexure-microscope-server!629
2026-06-28 13:34:25 +00:00
Julian Stirling
f65260b12c Fix temp dir path for data directories in unit tests 2026-06-26 22:02:35 +00:00
Julian Stirling
d4b935c63c Use padding rather than line height for button sizing 2026-06-25 20:15:15 +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
cc5ad7c5e7 Add tests to for gallery bulk actions 2026-06-25 17:40:49 +01:00
Julian Stirling
d020185c13 Update picamera test results 2026-06-25 17:14:43 +01:00
Julian Stirling
8d201dd1a9 Add sidebar to gallery for filtering and bulk actions 2026-06-25 17:01:31 +01:00
Julian Stirling
2dcd386661 Add way for gallery providers to specify bulk actions. 2026-06-25 17:01:07 +01:00
Joe Knapper
3e38722d45 Merge branch 'gallery_filter' into 'v3'
Adds filtering to the gallery

See merge request openflexure/openflexure-microscope-server!621
2026-06-25 09:54:17 +00:00
Joe Knapper
13a743188f Merge branch 'disclaimer' into 'v3'
Intended use disclaimer

See merge request openflexure/openflexure-microscope-server!614
2026-06-25 09:50:31 +00:00
Julian Stirling
407824f4cb Merge branch 'action-status-message' into 'v3'
Style action status message and don't show with last log.

Closes #802

See merge request openflexure/openflexure-microscope-server!620
2026-06-25 09:46:09 +00: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
86fbbc75de Style gallery filter for dark mode 2026-06-25 09:36:49 +01:00
Joe Knapper
84fba790ba Merge branch 'define-inverse-colours' into 'v3'
Define custom colour style and their inverse in variables.less

See merge request openflexure/openflexure-microscope-server!624
2026-06-25 08:35:54 +00:00
Julian Stirling
ae264efc02 Define custom colour style and their inverse in variables.less 2026-06-25 09:08:30 +01:00
Julian Stirling
8abc068efb Update picamera test results 2026-06-24 17:55:55 +01:00
Julian Stirling
366369ee7d Update test cased for gallery 2026-06-24 17:55:55 +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
e1e8cef8af Add a multi-select dropdown for gallery filtering 2026-06-24 17:55:54 +01:00
Julian Stirling
e08e996f48 Merge branch 'fix-hook-inverse' into 'v3'
Compile hook-inverse colours as CSS variables now components don't import the full less theme

See merge request openflexure/openflexure-microscope-server!623
2026-06-24 16:54:26 +00:00
Julian Stirling
7aab8b742a Compile hook-inverse colours as CSS variables now components don't import the full less theme 2026-06-24 17:44:06 +01:00
Joe Knapper
f2dbce5d47 Update wording 2026-06-24 16:35:58 +02:00