Commit graph

579 commits

Author SHA1 Message Date
jaknapper
ab0e00eb1d Fix ruff 2025-10-21 15:30:47 +01:00
jaknapper
d913db92af CCM for HQ cam also 2025-10-21 15:14:42 +01:00
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
ff606ff10d Apply spelling corrections and variable renaming from code review of branch improve-scan-planning
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
2025-10-20 18:26:20 +01:00
Julian Stirling
dbb0a4ac16 Fix issues found by MyPy 2025-10-19 23:04:24 +01:00
Julian Stirling
f781e6b674 Image intermediate locations between sample and background 2025-10-19 21:29:11 +01:00
Julian Stirling
39a04df5be Objects for scan locations allowing more sophisitcated tracking.
This commit updates the scan planners to allow more sophisticated
tracking of past positions. Currently it still checks that
the algorithm is unchanged from past behaviour.
2025-10-19 19:55:36 +01:00
jaknapper
416830cbe8 Strip new lines when logging stitching 2025-10-10 12:27:09 +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
94541b2d4f Merge branch 'stack-height-sanitise' into 'v3'
Verify stack params at start of scan main loop

Closes #455

See merge request openflexure/openflexure-microscope-server!400
2025-10-09 14:00:59 +00:00
Joe Knapper
089beae01a Tests for coercing stack params to valid values.
Co-authored with Julian Stirling
2025-10-09 14:26:01 +01:00
Joe Knapper
fa6fdb1a67 Stack parameter coercion in create_stack_params
Co-authored with Julian Stirling
2025-10-09 14:23:47 +01:00
Joe Knapper
33ff356f76 Apply suggestions from code review of branch stack-height-sanitise
Co-authored-by: Julian Stirling <julian@julianstirling.co.uk>
2025-10-09 14:22:48 +01:00
Richard Bowman
c89db72d0a Don't coerce or log from validators.
Passing a logger in to the Model is hard: I've changed the
StackParams model so that it only validates, and raises a
ValueError if it's not correct.

Pydantic will turn the ValueError into a ValidationError.
2025-10-09 14:22:45 +01:00
Joe Knapper
05e0394485 StackParams as pydantic basemodel with validators 2025-10-09 14:22:42 +01:00
Joe Knapper
f90e716d8e Stack limits as globals 2025-10-09 14:22:40 +01:00
jaknapper
18e49ba50c Test stack params at start of scan main loop 2025-10-09 14:22:37 +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
Joe Knapper
dae5b816cc Merge branch 'sample-size-sim' into 'v3'
Simulate a rectangular sample

Closes #516

See merge request openflexure/openflexure-microscope-server!401
2025-10-07 10:09:37 +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
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
3deb5a4897 Merge branch 'cancel-scan-early-bugfix' into 'v3'
Fix error trying to purge empty scans if current scan has no images

Closes #563

See merge request openflexure/openflexure-microscope-server!398
2025-09-26 09:33:21 +00: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
Beth Probert
1b4d83ae5d Resolve "Make Walkthroughs for Software Installation" 2025-09-25 11:03:53 +00: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
b9ca8b3094 Apply suggestions from code review of branch Increased-linting
Co-authored-by: Beth Probert <beth_probert@outlook.com>
2025-09-19 10:16:47 +00: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