Commit graph

4495 commits

Author SHA1 Message Date
Julian Stirling
ac5e6e33c0 Merge branch 'check_os' into 'v3'
Change shutdown command depending on OS

See merge request openflexure/openflexure-microscope-server!574
2026-05-01 09:19:13 +00:00
Julian Stirling
cc681a666c Change shutdown command depending on OS versions 2026-04-30 14:48:35 +01:00
Julian Stirling
5b14f8d820 Add method for checking OS version. 2026-04-30 14:14:24 +01:00
Joe Knapper
62d1724db6 Merge branch 'pull-webapp-from-fork' into 'v3'
Add -p argument to pull_webapp for setting GitLab project ID

See merge request openflexure/openflexure-microscope-server!573
2026-04-30 11:26:39 +00:00
Julian Stirling
a8eea66d82 Add -p argument to pull_webapp for setting GitLab project ID 2026-04-30 11:32:31 +01:00
Julian Stirling
43ea8bd59b Merge branch 'install-management-server' into 'v3'
Install management server from pypi.

See merge request openflexure/openflexure-microscope-server!572
2026-04-28 17:40:30 +00:00
Julian Stirling
be683ddb81 Merge branch 'v3-jpegsharpnessmonitor-concurrency' into 'v3'
Make properties of JPEGSharpnessMonitor read-only

See merge request openflexure/openflexure-microscope-server!571
2026-04-28 16:41:39 +00:00
Richard Bowman
9334e99551 Fix typing of JPEGSharpnessMonitor attributes
appends should be done on the underlying `_`-prefixed attributes, not on the `Sequence` typed properties.
2026-04-28 14:58:55 +01:00
Richard Bowman
d2aebf8b10 Make properties of JPEGSharpnessMonitor read-only
For thread-safety reasons we should not modify the lists used by
`JPEGSharpnessMonitor`. This commit marks them as read-only properties
and types them as `Sequence` so `mypy` should flag if they get modified.
2026-04-28 14:50:04 +01:00
Julian Stirling
0351f661ed Install management server from pypi. Will require os updates to launch. 2026-04-28 14:11:16 +01:00
Julian Stirling
e6005d052c Merge branch 'v3-steps-per-pixel' into 'v3'
Rename "pixels per step" to "steps per pixel"

Closes #648

See merge request openflexure/openflexure-microscope-server!568
2026-04-16 13:33:40 +00:00
Richard Bowman
4466b5abd8 Rename "pixels per step" to "steps per pixel"
I'm pretty sure the "pixels per step" label is incorrect and should actually read "steps per pixel".
Having looked at the code, the underlying variable is called csmRatio, which doesn't specify which way
round it should be. I think the minimal fix is to correct the label, which is what this commit does.
2026-04-16 13:43:31 +01:00
Joe Knapper
924676ff5d Merge branch 'stack-trends' into 'v3'
Stack trends

Closes #752

See merge request openflexure/openflexure-microscope-server!564
2026-04-16 12:20:01 +00:00
Joe Knapper
4da8172a16 Updates from review, mark tests as allowed to fail 2026-04-16 11:49:04 +01:00
Julian Stirling
01a19fab9b Merge branch 'labthings-debug-logging-config' into 'v3'
Add labthings debug config when spinning up a server

See merge request openflexure/openflexure-microscope-server!523
2026-04-14 12:43:50 +00:00
jaknapper
bc6ea9a1ca Manually test for increasing or decreasing stacks 2026-04-02 17:43:52 +01:00
Julian Stirling
3b53473475 Bump stitching version 2026-04-02 17:20:31 +01:00
Beth Probert
fff965dab4 Fix side effects in mocking 2026-04-02 15:30:26 +01:00
Beth Probert
7106ce1302 Set debug default value to False 2026-04-02 15:09:55 +01:00
Beth Probert
54b656952f Remove mock call to replace with real call 2026-04-02 15:09:39 +01:00
Beth Probert
01954167ab Merge branch 'v3' into labthings-debug-logging-config 2026-04-02 10:50:06 +01:00
Joe Knapper
483c94b3a9 Merge branch 'bump-stitching' into 'v3'
Bump stitching version

Closes #748

See merge request openflexure/openflexure-microscope-server!560
2026-03-27 16:39:26 +00:00
Julian Stirling
e0e023a0c9 Bump stitching version 2026-03-27 16:04:58 +00:00
Joe Knapper
70c36333a8 Data path based on containing DIR location 2026-03-26 17:25:47 +00:00
Joe Knapper
5a2787a039 Data path based on containing DIR location 2026-03-26 17:25:33 +00:00
Joe Knapper
92e5541267 Add test that stack checking agrees with at least 80% of manual labels 2026-03-26 16:48:50 +00:00
Joe Knapper
9149121d4b Merge branch 'prep-for-v3.0.0-alpha5' into 'v3'
Prep for v3.0.0 alpha5

See merge request openflexure/openflexure-microscope-server!557
2026-03-26 15:03:37 +00:00
Julian Stirling
70cf45d3c5 Update Changelog for alpha 5 release 2026-03-26 14:13:58 +00:00
Julian Stirling
4f86833393 Bump version numbers for alpha5 release. 2026-03-26 14:12:51 +00:00
Julian Stirling
72c9fcffe0 Merge branch 'to-labthings-0.1' into 'v3'
Update dependency to labthings 0.1.0

See merge request openflexure/openflexure-microscope-server!538
2026-03-26 10:32:29 +00:00
Julian Stirling
61f44b9af1 Merge branch 'resort-scans' into 'v3'
Sort scans by created time

Closes #708

See merge request openflexure/openflexure-microscope-server!551
2026-03-26 10:26:24 +00:00
Joe Knapper
74476f18a0 Merge branch 'smart_stack_as_mixin' into 'v3'
Move smart stacking into a mixin so it can be re-used in other workflows

See merge request openflexure/openflexure-microscope-server!554
2026-03-25 13:45:09 +00:00
Julian Stirling
c4cee38923 Merge branch 'remove-posixpath' into 'v3'
Move from posix path to os path

See merge request openflexure/openflexure-microscope-server!552
2026-03-25 12:57:10 +00:00
Julian Stirling
17feec33e2 Apply suggestions from code review of branch smart_stack_as_mixin
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
2026-03-25 12:26:32 +00:00
Julian Stirling
b7be12e183 Fix c-chip workflow and stop forcing the scan workflow mixin to be a workflow 2026-03-25 09:45:38 +00:00
Julian Stirling
5303664a4e Fix tests 2026-03-24 16:31:04 +00:00
Julian Stirling
b8db7ae2a1 Don't define both stacks for CChips 2026-03-24 16:21:18 +00:00
Julian Stirling
a82fcca339 Move smart stacking into a mixin so it can be re-used in other workflows 2026-03-24 15:58:04 +00:00
Joe Knapper
5283c1a3c5 Extra normpath in Thing startup 2026-03-24 12:40:19 +00:00
Joe Knapper
b040f63a29 Merge branch 'wrap-uk-notifications' into 'v3'
Word break long lines in notifications

Closes #730

See merge request openflexure/openflexure-microscope-server!548
2026-03-24 11:45:04 +00:00
Julian Stirling
ad638fa8ee Bump LabThings FastAPI requirement to 0.1.0 2026-03-24 08:45:29 +00:00
Joe Knapper
1d11e7044e Move from posix path to os path 2026-03-23 16:59:57 +00:00
Joe Knapper
646adb9a69 Sort scans by created time 2026-03-23 11:24:25 +00:00
Joe Knapper
65ac551688 Merge branch 'action-tab-2' into 'v3'
Split up slide scan tab and create a generic action tab (attempt 2)

See merge request openflexure/openflexure-microscope-server!536
2026-03-23 10:17:18 +00:00
Joe Knapper
8bc05ed894 Merge branch 'sigkill-handling' into 'v3'
Explicit windows check before sigkill for mypy

Closes #729

See merge request openflexure/openflexure-microscope-server!547
2026-03-18 16:13:25 +00:00
Joe Knapper
91075af70e Apply suggestions from code review of branch sigkill-handling
Co-authored-by: Beth Probert <beth_probert@outlook.com>
2026-03-18 14:51:32 +00:00
Joe Knapper
e703ce0697 Word break long lines in notifications 2026-03-18 14:33:49 +00:00
Joe Knapper
0618263830 Switch to ignoring line 2026-03-18 14:12:27 +00:00
Joe Knapper
1f43d1cc53 Explicit windows check before sigkill for mypy 2026-03-18 12:40:55 +00:00
Julian Stirling
b0d1e2626a Merge branch 'update-docs' into 'v3'
Update path to ofm server and config file in docs

See merge request openflexure/openflexure-microscope-server!546
2026-03-17 23:34:40 +00:00