Commit graph

3554 commits

Author SHA1 Message Date
Julian Stirling
573fc20dec Add new tests new scan directory function and for scan data serialisation 2025-08-06 17:27:26 +01:00
Julian Stirling
6ceb1a9845 Pull stitching out of SmartScanThing 2025-08-06 17:27:26 +01:00
Julian Stirling
f449bcdd78 Turn scan_data into a BaseModel with validation for custom formatting 2025-08-06 17:27:26 +01:00
Julian Stirling
d80d08dd83 Merge branch 'pull-webapp' into 'v3'
Pull webapp

Closes #512

See merge request openflexure/openflexure-microscope-server!347
2025-08-06 16:11:01 +00:00
Julian Stirling
73beb2b09d Merge branch 'fix-movements' into 'v3'
Fix movements axes

Closes #498

See merge request openflexure/openflexure-microscope-server!338
2025-08-06 15:50:08 +00:00
Julian Stirling
ac98205391 Apply suggestions from code review of branch pull-webapp
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
2025-08-06 15:27:02 +00:00
jaknapper
2f21fd6200 Describe expected behaviour in stage settings 2025-08-06 15:57:00 +01:00
Julian Stirling
7a241f30a1 Update developer guidance in README 2025-08-06 15:05:33 +01:00
Julian Stirling
25e41dbff4 Add script to pull webapp from CI artifacts 2025-08-06 15:04:11 +01:00
jaknapper
772a4c4301 Remove z key invert option
More space between invert options and Zero button

Rename Step Size to Keyboard Step Size
2025-08-06 14:21:49 +01:00
Julian Stirling
0921a73a81 Merge branch 'simulation-scanning' into 'v3'
Scanning in simulation

Closes #395

See merge request openflexure/openflexure-microscope-server!344
2025-08-06 13:11:14 +00:00
Julian Stirling
b672c3c2a7 Clarify docstring for Simulation start_streaming 2025-08-06 13:24:25 +01:00
jaknapper
5edf15ca7a Action button to invert z axis in stage coordinates 2025-08-06 12:15:39 +01:00
Julian Stirling
beb534272e Merge branch 'thread_safe_scan_directory_manager' into 'v3'
Make scan directory manager thread safe

Closes #506

See merge request openflexure/openflexure-microscope-server!346
2025-08-05 22:54:52 +00:00
Julian Stirling
ad739e4830 Update integration test as iamge size for simulation camera changed. 2025-08-05 23:52:20 +01:00
Julian Stirling
480af1d938 Update picamera_coverage.zip as camera source changed 2025-08-05 23:21:42 +01:00
Julian Stirling
cbd2f9e0e3 Add check that _lock is a lock in requires_lock 2025-08-05 23:13:11 +01:00
Julian Stirling
9be9097246 Make scan directory manager thread safe 2025-08-05 23:13:11 +01:00
Joe Knapper
c7dd269c01 Apply suggestions from code review of branch fix-movements
Co-authored-by: Julian Stirling <julian@julianstirling.co.uk>
2025-08-05 13:09:59 +00:00
Joe Knapper
4b4256aefe Merge branch 'background_detect_configure' into 'v3'
Change "settings" to "configure" in background detect tab

Closes #487

See merge request openflexure/openflexure-microscope-server!345
2025-08-05 10:58:28 +00:00
Chish36
3d07e990fd Change "settings" to "configure" in background detect tab 2025-08-05 08:52:19 +01:00
Julian Stirling
f3c8add398 Make axis inversion robust agains UI sending positions as strings 2025-08-05 08:30:54 +01:00
Julian Stirling
4eca6c3f54 Fix docstring formatting 2025-08-05 08:30:54 +01:00
Julian Stirling
dacf219ea1 Change from axis direction set by ints to set by bools. Add a lot more tests. 2025-08-05 08:30:54 +01:00
Julian Stirling
58e3b5dcbd Start adding stage test and apply fixes to base class 2025-08-05 08:30:54 +01:00
Julian Stirling
7e5a455b75 Complete refactor so that child stages only work in hardware reference frame and BaseStage handles conversion 2025-08-05 08:30:54 +01:00
Julian Stirling
b373931c1a Start to refactor into having an internal and external coordinates for stages to handle inversion 2025-08-05 08:30:54 +01:00
jaknapper
ee9362ce48 Invert x by default 2025-08-05 08:30:54 +01:00
jaknapper
35fbef67e4 axis direction server setting and action to invert each axis 2025-08-05 08:30:54 +01:00
jaknapper
591d085359 Realign and document key presses in GUI 2025-08-05 08:30:54 +01:00
Julian Stirling
8ce06991f9 Small tweaks to simulation camera to get scanning working. 2025-08-05 08:28:10 +01:00
Julian Stirling
b75af87b84 Merge branch 'camera-and-bg-detect-setting-customisation' into 'v3'
Dynamic UI for camera and background detect settings

See merge request openflexure/openflexure-microscope-server!331
2025-08-04 23:34:10 +00:00
Julian Stirling
7231e1cf5b Apply suggestions from code review of branch camera-and-bg-detect-setting-customisation 2025-08-04 22:44:40 +00:00
Julian Stirling
81f44dbdf3 Merge branch 'coverage-to-2dp' into 'v3'
Update .coveragerc to get 2 decimal places for coverage

See merge request openflexure/openflexure-microscope-server!343
2025-08-04 12:55:16 +00:00
Julian Stirling
bb6b8fe93f Update .coveragerc to get 2 decimal places for coverage 2025-08-04 12:59:34 +01:00
Julian Stirling
d994119b36 Add test to stop camera Thing APIs diverging futher without review 2025-08-01 23:08:33 +01:00
Julian Stirling
afc621b847 Rerun tests on Pi and update picamera coverage data 2025-07-31 22:28:59 +01:00
Julian Stirling
649d5ca267 Fix primary and secondary camera actions being switched in UI 2025-07-31 21:24:01 +01:00
Julian Stirling
cde6d0c9b3 Save settings when detector settings updated 2025-07-31 21:10:52 +01:00
Julian Stirling
5296092b6b Fix tests now background status settings are returned as dictionaries. 2025-07-31 20:56:55 +01:00
Julian Stirling
33413a591a Complete UI for arbitrary dectector settings. Required better method for invoking actions.
Error handling was fixed in the process of getting the above correct.
2025-07-31 20:56:55 +01:00
Julian Stirling
92d15d921b Display background detector settings built automatically from schema 2025-07-31 20:56:55 +01:00
Julian Stirling
d376eee5d5 Remove custom error for background. Do not allow check if background is not set. 2025-07-31 20:56:55 +01:00
Julian Stirling
7f4b4ed1f3 Splitting logic for property control from logic to create UI from schema 2025-07-31 20:56:55 +01:00
Julian Stirling
e7e3a08210 Camera settings exposed in UI defined by server. 2025-07-31 20:56:55 +01:00
Julian Stirling
3651013440 Generalise server specified action buttons. 2025-07-31 20:56:55 +01:00
Julian Stirling
0794d4777f Camera calibration buttons specified by server. Simulation has option to remove sample 2025-07-31 20:56:55 +01:00
Julian Stirling
1e89ef0ff7 Merge branch 'img-name' into 'v3'
Prepend images with img_

Closes #478

See merge request openflexure/openflexure-microscope-server!341
2025-07-31 16:05:10 +00:00
Joe Knapper
c00c027ab1 Apply suggestions from code review of branch img-name
Co-authored-by: Julian Stirling <julian@julianstirling.co.uk>
2025-07-31 14:52:21 +00:00
jaknapper
df918bf286 Prepend images with img_ 2025-07-31 13:53:57 +01:00