Commit graph

198 commits

Author SHA1 Message Date
Julian Stirling
4dc41bb008 Single line summaries of docstrings 2025-07-10 09:24:49 +01:00
Julian Stirling
35d47fe3ed Starting docstring on the same lines as the quotations 2025-07-10 09:24:49 +01:00
Julian Stirling
f51dae7b3a Doc strings to imperative mood 2025-07-10 09:24:49 +01:00
Julian Stirling
a84a916719 Restructured text fixes so that pydoctor would return without an error 2025-07-09 23:59:08 +01:00
Julian Stirling
52a80ef66b And adjust for new as lt import 2025-07-07 15:25:14 +01:00
Julian Stirling
840ed7f20e Update Thing Settings to use the new format provided by PR #110 of Labthings FastAPI 2025-07-07 15:24:30 +01:00
Julian Stirling
e7cf0c3f24 Allow stiching to be cancelled after a scan complete
Closes #417
2025-07-02 18:13:48 +01:00
Julian Stirling
254305a7a5 Clarify whether name or path is returned in scan directory functions 2025-07-01 19:21:56 +01:00
jaknapper
ff43deae36 Download stitched image of scan (if present)
* Docstring for download stitch
* use global STITCH_SUFFIX
2025-06-30 20:18:48 +01:00
Julian Stirling
51f9df995d More changes suggested in review, generally docstring issues. 2025-06-30 17:25:58 +01:00
Julian Stirling
ad838e8643 Apply suggestions from code review of branch split-scan-dir-operations
Co-authored-by: Beth Probert <beth_probert@outlook.com>
2025-06-30 17:25:58 +01:00
Julian Stirling
7193ec34f5 Starting to test more smart scan functionality using mocked Thing Dependencies 2025-06-27 21:06:16 +01:00
Julian Stirling
1267d881b9 Start writing tests for smart scan
Focusing on methods that don't start the whole scan.
2025-06-27 21:06:16 +01:00
Julian Stirling
32f78a4cff Trying to make a distinction between file directory operations for scans and scanning code
This started as a small change and spiralled out of control it needs good unit tests and testing
before considering to merge
2025-06-27 21:06:16 +01:00
Julian Stirling
0d2f324324 Split creation of scan directory information into class with small testable methods 2025-06-27 21:06:16 +01:00
Julian Stirling
73e54b802b Stop smart stack infinietly looping 2025-06-27 01:29:26 +01:00
Julian Stirling
43d5f2fdfe Change capture_resolution to save resolution, because it is used for saving not capture 2025-06-26 19:00:52 +01:00
Julian Stirling
6a87805b47 Fixing a number of issues from the merge and refactor. 2025-06-26 18:29:12 +01:00
Julian Stirling
61dd5e4958 Compete first (untested) pass of trying to make fast stack compatible with new memory captures 2025-06-26 17:43:11 +01:00
Julian Stirling
fda0a6e1ab Merge branch 'v3' into fast-stack, with conflict resolution but not fully
working yet
2025-06-26 11:50:24 +01:00
Julian Stirling
0933ece63a Apply suggestions from code review of branch jpeg-capture-in-stacking
Co-authored-by: Beth Probert <beth_probert@outlook.com>
2025-06-25 15:39:36 +01:00
jaknapper
62a07622fa If not provided, find resize from image size when stitching 2025-06-23 15:09:18 +01:00
jaknapper
8fea35a663 Remove duplicate docstring 2025-06-23 12:05:52 +01:00
jaknapper
4271c28045 More descriptive variable names in smart_scan, use resize in stitching with no default 2025-06-23 11:25:49 +01:00
jaknapper
985d20e032 Capture resolution as a Thing property 2025-06-23 11:25:49 +01:00
jaknapper
478c3629c9 Scan_resize from global vars, added to scan_data 2025-06-23 11:19:23 +01:00
jaknapper
d39bcbaf5c Moved streaming changing to inner loop 2025-06-23 11:19:23 +01:00
jaknapper
dbed1c6971 Default resize in stitching for scan tab stitching 2025-06-23 11:17:46 +01:00
jaknapper
9f2a131f1e Swap stream for scan, target_resolution as arg 2025-06-23 11:17:46 +01:00
jaknapper
f5c1ff2621 Ruff formating 2025-06-23 11:17:46 +01:00
jaknapper
17f3bbe646 Low res stream during scanning for instant high res captures 2025-06-23 11:17:46 +01:00
jaknapper
a9fdd0ea3e Wait params in captures, multiple attempts to capture 2025-06-23 11:17:46 +01:00
jaknapper
de7ffb9d1e Stream_name and capture_method args updated 2025-06-23 11:17:46 +01:00
jaknapper
132efa8033 Options for capture method, default downsampling of correlations 2025-06-23 11:17:45 +01:00
jaknapper
ab33de7ccd Capture a jpeg to disk 2025-06-23 11:17:45 +01:00
jaknapper
d8878e40da Stacking in autofocus with temp capture Thing 2025-06-23 11:17:45 +01:00
jaknapper
603b9c7d16 Functional z stack Thing 2025-06-23 11:17:45 +01:00
jaknapper
6acfbaefd6 Split up z stack function 2025-06-18 18:36:21 +01:00
jaknapper
e8c4103bb0 Remove unneeded logging 2025-06-17 14:34:42 +01:00
jaknapper
dbb65d55b5 Use scan autofocus dz 2025-06-17 14:34:42 +01:00
jaknapper
3e164102f6 A stack that tests whether the sharpest image is towards the middle 2025-06-17 14:34:42 +01:00
Julian Stirling
b45f5651ab Add scan directory to json config 2025-06-06 12:21:51 +01:00
jaknapper
a499d9230c Switch to updated "preview stitch" mode in stitching 2025-05-23 16:28:22 +01:00
jaknapper
cc3620d2ed Stitch with dzi by default, and check for dzi available in scans() 2025-05-23 16:28:21 +01:00
Julian Stirling
fe1696df28 Fix error in purge_empty_scans if the images dir hadn't been created 2025-05-23 12:49:46 +01:00
Julian Stirling
70f4304b2e Fix bug where .jpg files are not counted in scan list (only .jpeg) 2025-05-23 11:45:26 +01:00
Julian Stirling
6332c8b647 Merge branch 'openflexure-stitching-from-pip' into 'v3'
Import openflexure-stitching from pip

See merge request openflexure/openflexure-microscope-server!270
2025-05-21 10:00:48 +00:00
jaknapper
44f2435ea4 Removed stitching path as kwarg for scanning 2025-05-21 10:30:42 +01:00
Julian Stirling
c793620fcd Merge branch 'cleanup_empty_scans' into 'v3'
Added purge_empty_scans() method

Closes #370

See merge request openflexure/openflexure-microscope-server!257
2025-05-20 18:26:00 +00:00
Joe Knapper
6c8c8bf358 Apply 1 suggestion(s) to 1 file(s)
Co-authored-by: Julian Stirling <julian@julianstirling.co.uk>
2025-05-20 17:04:48 +00:00