Commit graph

3132 commits

Author SHA1 Message Date
Julian Stirling
a43a82213d Improve docs for hardware specific tests 2025-06-24 14:07:58 +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
Julian Stirling
febb0d2690 Clarify white balance code. 2025-06-23 17:49:35 +01:00
Julian Stirling
cdae90013a Modify comment for clarity in the function that copies the lens shading algorithm 2025-06-23 16:24:40 +00:00
Julian Stirling
afea1e3658 Create function for flattening and rounding array and converting to a list 2025-06-23 17:22:28 +01:00
jaknapper
62a07622fa If not provided, find resize from image size when stitching 2025-06-23 15:09:18 +01:00
Julian Stirling
c659ba8f5e Minor tidying to Picamera Thing 2025-06-23 13:07:26 +01:00
Julian Stirling
dd63d74651 Removing mjpeg bitrate setter from UI and Python as it wasn't implemented fully and isn't a setting that should need changing 2025-06-23 12:39:41 +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
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
Julian Stirling
b5606984ae Consolidate the BaseCamera, CameraStub, and CameraProtocol, move StreamingPiCamera2 to this repo 2025-06-23 11:25:49 +01:00
jaknapper
628fd145f3 Cleaned up settling time maths to only calculate once 2025-06-23 11:25:49 +01:00
jaknapper
35e1d6cdee Remove unused actions in capture 2025-06-23 11:25:49 +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
7052917ff9 capture_image in stub raises NotImplemented 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
8c8c6568c3 Updated docstring for start_streaming 2025-06-23 11:25:49 +01:00
jaknapper
2d946637eb Added buffer_count as an argument of streaming 2025-06-23 11:25:48 +01:00
jaknapper
968bd339c2 SETTLING_TIME global in stacking 2025-06-23 11:25:37 +01:00
jaknapper
478c3629c9 Scan_resize from global vars, added to scan_data 2025-06-23 11:19:23 +01:00
jaknapper
52b58241cc Added copy_sharpest_image to autofocus 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
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
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
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
jaknapper
46458ca8a1 Create a stack folder and copy the middle image to image_dir 2025-06-23 11:17:45 +01:00
jaknapper
a1784941fe Ruff formatting and removing all capturing from smart_scan 2025-06-23 11:17:45 +01:00
jaknapper
603b9c7d16 Functional z stack Thing 2025-06-23 11:17:45 +01:00
Joe Knapper
4c72098536 Merge branch 'shutdown-timeout' into 'v3'
Add a timeout when shutting down the server.

See merge request openflexure/openflexure-microscope-server!297
2025-06-20 16:35:37 +00:00
Joe Knapper
cc506b8794 Merge branch 'simulation-axes' into 'v3'
Git ignore openflexure/ dir

See merge request openflexure/openflexure-microscope-server!298
2025-06-20 16:32:37 +00:00
Joe Knapper
9dac080566 Fixed merge conflict 2025-06-20 15:14:35 +00:00
Joe Knapper
b05e3bee63 added openflexure/ to .gitignore 2025-06-20 16:11:07 +01:00
Julian Stirling
cdf23bc403 Add a timeout when shutting down the server.
The browser needs to be closed for graceful shutdown. If the browser
is left open the microscope may never shut down as it is waiting on
the uvicorn process to finish. This causes potential SD card issues.

This forces the server to force shutdown if it doesn't exit gracefully in
2 seconds.
2025-06-19 16:25:43 -04:00
Joe Knapper
b01032be99 Merge branch 'update-issue-templates' into 'v3'
Update issue templates

See merge request openflexure/openflexure-microscope-server!295
2025-06-17 16:23:43 +00:00
Julian Stirling
dd24a3863d Apply suggestions from code review of branch update-issue-templates
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
2025-06-17 15:58:45 +00:00
Julian Stirling
f7545c6d8d Update issue templates 2025-06-17 11:18:33 -04:00