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

4861 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Julian Stirling
92bd162413 update picamera coverage zip 2026-07-02 16:56:18 +01: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
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
cbf0c30607 Merge branch 'modes-docstring' into 'v3' 
Changed docstring for capture modes

See merge request openflexure/openflexure-microscope-server!639
 2026-07-02 12:29:10 +00: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
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
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
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
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