Commit graph

80 commits

Author SHA1 Message Date
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
8002600fcf Apply suggestions from code review of branch fast-stack
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
2025-06-27 16:40:18 +00:00
Julian Stirling
9a92fd478a Final docstring and testing updates based on code review 2025-06-27 16:54:28 +01:00
Julian Stirling
46f3d21632 Apply suggestions from code review of branch fast-stack
Co-authored-by: Beth Probert <beth_probert@outlook.com>
2025-06-27 11:52:53 +01:00
Julian Stirling
fc6c13f40e Apply suggestions from code review of branch fast-stack
Co-authored-by: Beth Probert <beth_probert@outlook.com>
2025-06-27 10:41:53 +00:00
Julian Stirling
73e54b802b Stop smart stack infinietly looping 2025-06-27 01:29:26 +01:00
Julian Stirling
2ce2f998fa add tests for helper classes defined by fast stack 2025-06-27 00:34:51 +01:00
Julian Stirling
2aea6a2569 Docstrings and stop using Pydantic for ScanParameters 2025-06-26 19:46:25 +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
Joe Knapper
378998d230 Merge branch 'jpeg-capture-in-stacking' into 'v3'
2MP from 8MP capturing

Closes #364, #413, #298, #303, #288, #358, and #433

See merge request openflexure/openflexure-microscope-server!251
2025-06-25 17:57:51 +00: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
Julian Stirling
be07966631 Remove the overwriting of internal globals, requires removing future annoations 2025-06-24 10:18:30 +01:00
jaknapper
11c8f47e20 Rename central image to sharpest 2025-06-23 18:13:46 +01:00
jaknapper
7c3a9ad01f Copy sharpest image from stack, not the most average sharpness! 2025-06-23 18:08:27 +01:00
jaknapper
8ba40832e0 Neighbour cutoff moved from autofocus.py to scan_planners.py 2025-06-23 14:13:08 +01:00
jaknapper
2a0de9122b computed_field pydantic decorators 2025-06-23 14:04:30 +01:00
jaknapper
ee128ad91f Rename to StackParams, move undershoots into Params 2025-06-23 13:47:14 +01:00
jaknapper
7cff0f8f44 StackInfo dataclass 2025-06-23 12:56:31 +01:00
Julian Stirling
72faba0272 Fix issues found by linter in PiCamera Code
Issue #423 created based on lens shading TODOs
2025-06-23 12:39:25 +01:00
jaknapper
333ea1b644 More input validation and comments 2025-06-23 12:02:00 +01:00
Joe Knapper
7a7547542c Apply suggestions from code review of branch fast-stack
Co-authored-by: Julian Stirling <julian@julianstirling.co.uk>
2025-06-23 10:36:26 +00:00
Julian Stirling
0e3f4305b5 Tidy post refactor of cameras 2025-06-23 11:26:24 +01:00
Julian Stirling
4368dc3d90 Consolidate functionality into BaseCamera from Capture Thing and StreamingPicamera2 2025-06-23 11:26:22 +01:00
jaknapper
628fd145f3 Cleaned up settling time maths to only calculate once 2025-06-23 11:25:49 +01:00
jaknapper
2f9e37a02f More descriptive timing variable names 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
968bd339c2 SETTLING_TIME global in stacking 2025-06-23 11:25:37 +01:00
jaknapper
52b58241cc Added copy_sharpest_image to autofocus 2025-06-23 11:19:23 +01:00
jaknapper
0d32983b62 Only undershoot z stack if image count > 1, settle before first capture 2025-06-23 11:19:23 +01:00
jaknapper
744ec28f93 Get images as a PIL image from camera, use resizing and saving as settling time in stack 2025-06-23 11:19:20 +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
de7ffb9d1e Stream_name and capture_method args updated 2025-06-23 11:17:46 +01:00
jaknapper
8bc0573ab1 Capture_array can now use "full" stream 2025-06-23 11:17:46 +01:00
jaknapper
9d1385231d Rename jpeg_array to highres_array 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
26163dc97e Added a new way to capture full res JPEGs, need to do a comparison of results 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
Joe Knapper
d1ed7ec797 Apply suggestions from code review of branch fast-stack 2025-06-20 11:26:58 +00:00
Joe Knapper
006d3b2a7b Apply suggestions from code review of branch fast-stack
Co-authored-by: Beth Probert <beth_probert@outlook.com>
2025-06-20 11:23:14 +00:00
jaknapper
ce33b94aab Capture as a Raw dependency to use methods that aren't actions 2025-06-20 12:19:07 +01:00
jaknapper
6cf2f4d8c3 Typehints and docstrings in z_stack 2025-06-19 14:58:16 +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