Commit graph

861 commits

Author SHA1 Message Date
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
Julian Stirling
4345f8c336 Merge branch 'tweak-scan-list' into 'v3'
Scan list improvements

Closes #391

See merge request openflexure/openflexure-microscope-server!397
2025-09-29 08:55:13 +00: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
Julian Stirling
14cc3f9fcf Fix error trying to purge empty scans if current scan has no images
Closes #563
2025-09-25 15:12:34 +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
cd6bcd196f Don't show buttons for ongoing scans. 2025-09-19 18:29:34 +01:00
Julian Stirling
6b1e40f689 Add flake8-simplicity rules 2025-09-18 16:21:45 +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
338d49f9e6 Remove remaining TODOs in favour of issues 2025-09-18 16:10:36 +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
8500b479f5 No Never returns from actions in base Thing classes 2025-08-28 09:13:44 +01:00
Julian Stirling
8f78369aaf fixup! Add ANN20X rules to ruff 2025-08-27 18:56:19 +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
d673196671 Add ANN002, and ANN003 rules 2025-08-27 18:54:16 +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
4450fda945 Merge branch 'simulation_wrap' into 'v3'
Make simulation image wrap to prevent errors when moving out of range.

Closes #513

See merge request openflexure/openflexure-microscope-server!380
2025-08-27 16:13:24 +00:00
Julian Stirling
5515d55e6d Merge branch 'error-types' into 'v3'
Tweak a few error types.

Closes #320

See merge request openflexure/openflexure-microscope-server!376
2025-08-27 13:47:26 +00: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
dade26cde1 Tweak a few error types. 2025-08-21 16:11:30 +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
Joe Knapper
c2980dc988 Merge branch 'typehint-autofocus' into 'v3'
Typehints and better variable names for autofocus

Closes #271

See merge request openflexure/openflexure-microscope-server!367
2025-08-15 10:30:36 +00:00
Joe Knapper
f383365cf7 Apply suggestions from code review of branch typehint-autofocus
Co-authored-by: Julian Stirling <julian@julianstirling.co.uk>
2025-08-15 10:30:29 +00:00
Joe Knapper
bd115e0023 Change all CameraDeps to CameraClients 2025-08-15 10:16:36 +00:00