Commit graph

3423 commits

Author SHA1 Message Date
Joe Knapper
1e368aef81 Apply suggestions from code review of branch log-oom-error
Co-authored-by: Julian Stirling <julian@julianstirling.co.uk>
2025-08-14 14:09:54 +01:00
jaknapper
4d32152427 Custom Memory error changed to generic sigkill 2025-08-07 18:10:02 +01:00
jaknapper
feec53aa1f Custom out of memory error 2025-08-07 17:56:34 +01:00
Julian Stirling
bc103f8cdf Merge branch 'yet-another-smart-scan-refactor' into 'v3'
Break up SmartScan further so it can be tested

Closes #482 and #311

See merge request openflexure/openflexure-microscope-server!342
2025-08-07 15:03:52 +00:00
Julian Stirling
dbdf254154 Fix CLI arg for FinalStitcher, and a docstring typo. 2025-08-07 15:20:14 +01:00
Julian Stirling
5caae613dc Apply suggestions from code review of branch yet-another-smart-scan-refactor
Co-authored-by: Beth Probert <beth_probert@outlook.com>
2025-08-07 13:55:47 +00:00
Julian Stirling
7727d0a51d Update language in BaseStitcher to clarify that the stitching uses subprocess not threading 2025-08-07 12:06:58 +01:00
Julian Stirling
cd311f08bf Update stiching to differentiate bwtween stitchers that use a thread and those that block 2025-08-06 17:47:33 +01:00
Julian Stirling
5f092835ac Apply suggestions from code review of branch yet-another-smart-scan-refactor 2025-08-06 17:27:26 +01:00
Julian Stirling
2e6ba73345 Apply suggestions from code review of branch yet-another-smart-scan-refactor
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
2025-08-06 17:27:26 +01:00
Julian Stirling
6739a84d7c Apply suggestions from code review of branch yet-another-smart-scan-refactor
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
2025-08-06 17:27:26 +01:00
Julian Stirling
f9fcdf628b Squash final todos for SmartScan refactor 2025-08-06 17:27:26 +01:00
Julian Stirling
7d83aadf8d Squash some TODOs 2025-08-06 17:27:26 +01:00
Julian Stirling
4e9b07c78f Consolidate information into ScanData, remove ad-hoc differences for specific error in _run_scan 2025-08-06 17:27:26 +01:00
Julian Stirling
82691a6b78 Tweak error reporting in _run_scan and add a lot more testing for _run_scan 2025-08-06 17:27:26 +01:00
Julian Stirling
d7a7ac4c7d More complete testing of code that runs stitching subprocess. 2025-08-06 17:27:26 +01:00
Julian Stirling
cf74ea1351 More complete testing of code that runs stitching subprocess. 2025-08-06 17:27:26 +01:00
Julian Stirling
7569c7d6b2 Add validation checks to prevent arbitrary code execution via stitching. 2025-08-06 17:27:26 +01:00
Julian Stirling
a632ddee92 Add unit tests for generated stitching commands. 2025-08-06 17:27:26 +01:00
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