Commit graph

3636 commits

Author SHA1 Message Date
Joe Knapper
0a274690ff Merge branch 'picam-test-readme-update' into 'v3'
Add section to Picamera tests README on keeping branches up to date

See merge request openflexure/openflexure-microscope-server!416
2025-10-23 15:35:59 +00:00
Julian Stirling
b1a70fd399 Apply suggestions from code review of branch picam-test-readme-update
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
2025-10-23 15:17:18 +00:00
Julian Stirling
ac1b6549e1 Add section to Picamera tests README on keeping branches up to date 2025-10-23 11:11:30 +01:00
Julian Stirling
13b190a8ca Merge branch 'modified-times' into 'v3'
Scan tab show scan duration

See merge request openflexure/openflexure-microscope-server!408
2025-10-23 00:15:10 +00:00
Julian Stirling
203fb53c42 Merge branch 'fix-sync-button' into 'v3'
Fix sync button to emit click on click event.

See merge request openflexure/openflexure-microscope-server!413
2025-10-21 15:45:39 +00:00
Joe Knapper
be5087b9ca Merge branch 'colourful-dragon' into 'v3'
Colour sliders in seadragon viewer

See merge request openflexure/openflexure-microscope-server!409
2025-10-21 15:43:45 +00:00
Joe Knapper
073ef2cae5 Merge branch 'camera-defaults-patch' into 'v3'
Set colour correction to interpolate value

See merge request openflexure/openflexure-microscope-server!414
2025-10-21 15:08:46 +00:00
Julian Stirling
4c1dcdb8d1 Tidy up HTML spacing and styling 2025-10-21 16:05:53 +01:00
Julian Stirling
5c2d61baaa Refactor brightness, contrast, and saturation filters into Vue props. 2025-10-21 15:33:12 +01:00
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
d5701fab80 Fix sync button to emit click on click event. 2025-10-21 13:34:35 +01:00
Julian Stirling
04d3162091 Send scan duration as a number (or null) from backend. Format in UI 2025-10-21 11:47:10 +01:00
jaknapper
16687b5252 Format time difference in webapp 2025-10-20 23:53:56 +01:00
Julian Stirling
e51fbb4fa6 Merge branch 'improve-scan-planning' into 'v3'
Improve smart spiral scan planner to better capture the edge of scamples

Closes #559

See merge request openflexure/openflexure-microscope-server!411
2025-10-20 17:58:17 +00: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
0be62d773d Scan viewer component 2025-10-17 18:39:29 +01:00
Julian Stirling
3d3ca9ebcf Merge branch 'log-lines' into 'v3'
Strip new lines when logging stitching

Closes #567

See merge request openflexure/openflexure-microscope-server!406
2025-10-17 13:17:49 +00:00
jaknapper
19913b8f48 Limit brightness and contrast, move sliders to high z to avoid collisions 2025-10-16 12:45:14 +01:00
jaknapper
fb3658c933 Colour sliders in seadragon viewer 2025-10-16 11:47:30 +01:00
Joe Knapper
841c340cdf Scan data card centres lists, displays duration 2025-10-14 17:50:17 +01:00
Joe Knapper
f23c8cd490 Merge branch 'fix-jitter' into 'v3'
Fix jitter at specific screen sizes during scan

See merge request openflexure/openflexure-microscope-server!404
2025-10-10 14:14:34 +00:00
jaknapper
416830cbe8 Strip new lines when logging stitching 2025-10-10 12:27:09 +01:00
Julian Stirling
97fe2f357d Merge branch 'bump-version-for-alpha3' into 'v3'
Bump version for alpha3 and update changelog

See merge request openflexure/openflexure-microscope-server!405
2025-10-09 22:28:42 +00:00
Julian Stirling
96ffbb2b49 Bump version for alpha3 and update changelog 2025-10-09 19:55:42 +01:00
Julian Stirling
513a9e40bd Merge branch 'document_simulation' into 'v3'
Improve documentation for simulation server

Closes #517

See merge request openflexure/openflexure-microscope-server!390
2025-10-09 17:45:54 +00:00
Julian Stirling
c6bda196b1 Merge branch 'ce-disable' into 'v3'
Ce disable

Closes #553

See merge request openflexure/openflexure-microscope-server!403
2025-10-09 17:45:49 +00:00
jaknapper
b58ddbf7d9 Update testing 2025-10-09 17:51:15 +01:00
Julian Stirling
4135532476 Apply suggestions from code review of branch ce-disable 2025-10-09 17:46:13 +01:00
Julian Stirling
46f3a8d5de Fix jitter at specific screen sizes during scan 2025-10-09 17:00:45 +01:00
Chish36
38c991d232 Minor corrections applied 2025-10-09 15:53:57 +01:00
Chish36
e56a11ef66 Added more info on starting the simulation server and some basic instructions on simulating a scan 2025-10-09 15:51:26 +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
92b14265d1 Update picamera test results 2025-10-07 10:59:18 +01: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