Commit graph

134 commits

Author SHA1 Message Date
jaknapper
18ad404a57 Set colour correction to interpolate value
Update hardware test readme

Add pause between calibrating camera and setting background
2025-10-21 13:37:50 +01:00
Julian Stirling
4135532476 Apply suggestions from code review of branch ce-disable 2025-10-09 17:46:13 +01:00
Joe Knapper
909de1709d set ce_enable in tuning_utils 2025-10-09 15:36:01 +01:00
Julian Stirling
6a2d69ed04 Merge branch 'primary-buttons' into 'v3'
Clean up primary vs secondary buttons

Closes #554

See merge request openflexure/openflexure-microscope-server!402
2025-10-07 14:15:45 +00:00
Julian Stirling
7d794d1a22 Stop showing other picamera calibration buttons in calibration wizard 2025-10-07 10:52:06 +01:00
Joe Knapper
a34a9f99c5 Apply suggestions from code review of branch sample-size-sim
Co-authored-by: Julian Stirling <julian@julianstirling.co.uk>
2025-10-06 10:16:22 +00:00
jaknapper
a2facca43e Clean up primary vs secondary buttons 2025-10-02 16:16:32 +01:00
Joe Knapper
2fc92fc1ff Test sample and canvas size 2025-10-02 13:56:08 +01:00
Joe Knapper
3812e9053a Docstring fix 2025-09-26 17:16:55 +01:00
Joe Knapper
0a687e1678 Ruff 2025-09-25 18:51:33 +01:00
Joe Knapper
e6ba7f5a9b Merge branch 'sample-size-sim' of gitlab.com:openflexure/openflexure-microscope-server into sample-size-sim 2025-09-25 16:14:17 +01:00
Joe Knapper
bfe0064ce8 Update dummy test and fix sample coords 2025-09-25 16:14:13 +01:00
Joe Knapper
39b085a0c2 Apply suggestions from code review of branch sample-size-sim
Co-authored-by: Julian Stirling <julian@julianstirling.co.uk>
2025-09-25 13:35:55 +00:00
Joe Knapper
16bc7aeede Apply suggestions from code review of branch sample-size-sim
Co-authored-by: Julian Stirling <julian@julianstirling.co.uk>
2025-09-25 13:33:16 +00:00
Joe Knapper
d3aeb75ed9 Fixed centre typo 2025-09-25 12:52:17 +01:00
Joe Knapper
89214ea2ec Add sphinx docstrings, add sprites in a way to test sizes match 2025-09-25 12:05:49 +01:00
Joe Knapper
49070d4163 Generated limited size sample of larger blobs, move faster in xy 2025-09-24 19:31:11 +01:00
Joe Knapper
afcb02bf7e Increase density of blobs, limit range 2025-09-24 18:09:08 +01:00
Julian Stirling
528c6a2b63 Add PyLint ruff checks 2025-09-18 16:21:45 +01:00
Julian Stirling
65f172d650 Stop using print statments or root level loggers 2025-09-18 16:21:45 +01:00
Julian Stirling
ef89b536fc Remove assert statements from production code 2025-09-18 16:10:36 +01:00
Julian Stirling
e89ad93535 Specify the camera board not the sensor model during configuration. 2025-09-18 13:00:46 +01:00
Julian Stirling
ca66234379 Apply suggestions from code review of branch reorganise-picamera-tuning-and-recal
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
2025-09-18 13:00:46 +01:00
Julian Stirling
f24272bc7f Set sensor_model as kwarg to SteamingPicameraThing. From this load sensor information. 2025-09-18 13:00:46 +01:00
Julian Stirling
c16a0391df Divide up tuning file modification from camera actions for recalibration.
* Ensure that funtions only called locally by recalibrate utils are private
* Move public API to the top of the recalibrate utils file
* Move files that only alter the tuning dictionary to their own file

This makes the recalibration API used by PiCamera much more clearly defined, which
helps to plan out how to allow for different models.
2025-09-18 13:00:46 +01:00
jaknapper
5566125e6e Update picamera file to HQ parameters 2025-09-18 13:00:46 +01:00
jaknapper
22e7ce4ef0 Change background detect to use lores stream for consistent stream even when scanning. 2025-09-17 17:02:23 +01:00
Julian Stirling
2ce49088e7 Add return typehints to magic methods 2025-08-27 18:56:09 +01:00
Julian Stirling
4c46330959 Add ANN20X rules to ruff 2025-08-27 18:56:08 +01:00
Julian Stirling
24233412af Start adding ANN ruff rules 2025-08-27 18:54:15 +01:00
Julian Stirling
b46f429c1f Apply suggestions from code review of branch unify-jpeg-capture
Co-authored-by: Richard Bowman <richard.bowman@cantab.net>
2025-08-27 17:30:51 +01:00
Julian Stirling
5bb742881f Fix typehints and docs for opencv camera 2025-08-27 17:30:51 +01:00
Julian Stirling
b124355fed Fix capture array for raw stream 2025-08-27 17:14:49 +01:00
Julian Stirling
7cd6b11411 Further unification of camera array functionality 2025-08-27 17:14:49 +01:00
Julian Stirling
5484b51a1e Unify JPEG capture, metadata, and saving; reducing duplication 2025-08-27 17:14:49 +01:00
Julian Stirling
c31fffad5b Make simulation image wrap to prevent errors when moving out of range. 2025-08-26 16:03:56 +01:00
Julian Stirling
9257c4489e Apply suggestions from code review of branch prevent-broken-frames-ending-scans
Co-authored-by: Beth Probert <beth_probert@outlook.com>
2025-08-21 18:05:46 +01:00
Julian Stirling
6fa4e4dc64 Add a grab_as_array camera method that grabs from the stream but catches broken jpegs and retries 2025-08-21 13:35:21 +01:00
Julian Stirling
0a9b6be9bd Raise error if tuning algorithm cannot be returned, unless explicityly asked not to 2025-08-21 12:44:57 +01:00
Julian Stirling
fdae0b9226 Add get_tuning_algo method to StreamingPiCamera2 2025-08-20 14:53:53 +01:00
Julian Stirling
ab0bece70b Deepcopy default tuning file so it isn't affected by calibration. 2025-08-20 14:51:19 +01:00
Julian Stirling
6142a267db Add flake8 bugbear checks 2025-08-12 13:09:43 +01:00
Julian Stirling
b672c3c2a7 Clarify docstring for Simulation start_streaming 2025-08-06 13:24:25 +01:00
Julian Stirling
8ce06991f9 Small tweaks to simulation camera to get scanning working. 2025-08-05 08:28:10 +01:00
Julian Stirling
cde6d0c9b3 Save settings when detector settings updated 2025-07-31 21:10:52 +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
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
38f4a745c3 Fix bug with setting exposure time on load, add associated test 2025-07-29 14:05:12 +01:00