Commit graph

4050 commits

Author SHA1 Message Date
Julian Stirling
663a18a38f Merge branch 'scan-workflows' into 'v3'
Implement ScanWorkflows allowing multiple scanning methods

Closes #641, #566, #371, and #333

See merge request openflexure/openflexure-microscope-server!462
2026-02-06 15:21:09 +00:00
Julian Stirling
83c111e71f Update picamera coverage zip 2026-02-06 14:19:57 +00:00
Julian Stirling
cf941b1d11 Fix unit tests for scan workflows 2026-02-06 13:50:47 +00:00
Julian Stirling
8f30f08bdf Apply suggestions from code review of branch scan-workflows
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
2026-02-06 13:28:30 +00:00
Julian Stirling
504a47cbf8 Add some property tests for scanning 2026-01-18 23:37:10 +01:00
Julian Stirling
b26dda60a4 More tests and assoicated bugfixes 2026-01-18 23:19:44 +01:00
Julian Stirling
eb93342d9f Add test of logic for selecting worflow. 2026-01-18 14:23:18 +00:00
Julian Stirling
b22fcf4b88 Complete testing of HistoScanWorkflow 2026-01-16 18:16:50 +00:00
Julian Stirling
1bc6b9e0c4 Add a number of extra tests to ScanWorkflows 2026-01-16 17:02:07 +00:00
Julian Stirling
57b20782a0 Further fixes after introducing scan workflow selection 2026-01-16 13:04:23 +00:00
Julian Stirling
23426ae12c Reorder scan workflow title and blurb in scan tab 2026-01-16 12:25:55 +00:00
Julian Stirling
21b779a4a5 Dynamic UI for scan workflows 2026-01-16 12:18:54 +00:00
Julian Stirling
2a3a54b936 Get unit tests passing with Scan Workflows 2026-01-16 09:28:15 +00:00
Julian Stirling
c82523dd5b Start updating unit tests after refactoring into ScanWorkflows 2026-01-16 09:28:15 +00:00
Julian Stirling
11ef1217e0 Docstrings and tweaks of ScanWorflow refactor 2026-01-16 09:28:15 +00:00
Julian Stirling
c938560f00 Docstrings and final tweaks of ScanWorflow refactor 2026-01-15 21:59:53 +00:00
Julian Stirling
665622a802 First working interation of ScanWorkflows. Needs a tidy 2026-01-15 20:59:53 +00:00
Julian Stirling
adab5bae24 Start smart stack parameters in scan workflow 2026-01-15 16:05:02 +00:00
Julian Stirling
54ed78c832 Create aquisition routines for scan workflows, remove background detector from base ScanWorkflow class 2026-01-15 14:53:47 +00:00
Julian Stirling
b6343362b2 Start splitting ScanData into workflow specific data. 2026-01-15 12:59:06 +00:00
Julian Stirling
5ce74cad8a A start to implementing ScanWorkflow 2026-01-15 12:59:06 +00:00
Julian Stirling
5762fc5947 Merge branch 'background-detector-things' into 'v3'
Background detector things

See merge request openflexure/openflexure-microscope-server!461
2026-01-14 16:51:49 +00:00
Julian Stirling
53f35e6317 Update picamera coverage zip 2026-01-14 15:18:56 +00:00
Julian Stirling
ca46439269 Rename "active_detector" for background detecor. Improve thing selector coercion 2026-01-14 15:10:13 +00:00
Julian Stirling
e46836ffe1 Test background detector UI specification 2026-01-14 15:10:13 +00:00
Julian Stirling
b494e7dc3c Fix picamera test suite 2026-01-14 10:05:04 +00:00
Julian Stirling
6b97d2da44 Fix unit tests for background detectors as Things 2026-01-14 10:05:04 +00:00
Julian Stirling
3e8874188e Get UI working for background detector things 2026-01-14 10:05:04 +00:00
Julian Stirling
44860bf777 Continue turning background detectors back into Things 2026-01-14 10:05:04 +00:00
Julian Stirling
6a1ad573d9 Start turning background detectors back into things 2026-01-14 10:05:04 +00:00
Julian Stirling
dcf5b26c06 Merge branch 'scans_folder_bugfix' into 'v3'
Bugfix, stop saving scans into log folder

See merge request openflexure/openflexure-microscope-server!460
2026-01-14 10:03:34 +00:00
Julian Stirling
4b81d52a89 Add tests for _full_config_from_args 2026-01-13 20:32:05 +00:00
Julian Stirling
ad53f72a60 Bugfox, stop saving scans into log folder 2026-01-13 18:03:13 +00:00
Joe Knapper
9df3fd6360 Merge branch 'fast-sim' into 'v3'
Simulation Camera Improvements

Closes #638

See merge request openflexure/openflexure-microscope-server!458
2026-01-13 14:15:35 +00:00
Julian Stirling
0bba613a4b Apply suggestions from code review of branch fast-sim
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
2026-01-13 11:45:32 +00:00
Julian Stirling
51d6bdb991 Fully generate simulation sample canvas before setting to class attribute 2026-01-13 11:34:49 +00:00
Julian Stirling
6f74e447cd Merge branch 'Windows-Testing' into 'v3'
Fix (most) unit tests on Windows

See merge request openflexure/openflexure-microscope-server!457
2026-01-12 22:15:51 +00:00
Julian Stirling
795d145ae6 Merge branch 'proper-integration-tests' into 'v3'
Proper integration tests

Closes #480

See merge request openflexure/openflexure-microscope-server!456
2026-01-12 21:50:38 +00:00
Julian Stirling
a15458c02d Apply suggestions from code review of branch Windows-Testing
Co-authored-by: Richard Bowman <richard.bowman@cantab.net>
2026-01-12 21:40:58 +00:00
Julian Stirling
4c557612fb Apply suggestions from code review of branch fast-sim
Co-authored-by: Richard Bowman <richard.bowman@cantab.net>
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
2026-01-12 17:41:51 +00:00
Julian Stirling
ad8dd55cca Update integration test for new labthings client exceptions 2026-01-12 16:23:10 +00:00
Julian Stirling
6ec60523cd Ensure that each integration test tests more than just a lack of errors 2026-01-12 16:23:10 +00:00
Julian Stirling
7e9637e496 Run new integration suite in CI 2026-01-12 16:23:10 +00:00
Julian Stirling
8b51a66ae4 Move test_dummy_server out of unit tests and into integration tests. 2026-01-12 16:23:10 +00:00
Julian Stirling
c9ac85bffc Rename the test that fully boots the server to lifecycle_test 2026-01-12 16:23:09 +00:00
Julian Stirling
d6b00ef1bb Change out of temp dirs in git version tests before closing so windows doesn't error 2026-01-12 16:20:22 +00:00
Julian Stirling
3e8511f281 Use Python not echo as a mock shutdown command for windows compatibility 2026-01-12 16:20:22 +00:00
Julian Stirling
ec29a1999f Update how stitching is called in Windows 2026-01-12 16:20:22 +00:00
Julian Stirling
00a0301e0c Close file logging hander in unit tests before tmpdir cleanup 2026-01-12 16:20:22 +00:00
Julian Stirling
52293ba948 Normalise expected paths in windows tests 2026-01-12 16:20:22 +00:00