Commit graph

1125 commits

Author SHA1 Message Date
Joe Knapper
f35ad17449 Merge branch 'stitching-two' into 'v3'
Stitch 2 images

See merge request openflexure/openflexure-microscope-server!630
2026-06-30 17:31:00 +00:00
Joe Knapper
8f40f4d4e4 Merge branch 'rename-rom-thing' into 'v3'
Change RangeofMotionThing to StageMeasureThing

See merge request openflexure/openflexure-microscope-server!626
2026-06-29 14:45:28 +00:00
Julian Stirling
06a3a5a92e Apply suggestions from code review of branch rename-rom-thing
Co-authored-by: Chish36 <b.chisholm2002@gmail.com>
2026-06-29 14:16:54 +00:00
Julian Stirling
bd01abc7d1 Apply suggestions from code review of branch rename-rom-thing
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
2026-06-29 13:53:13 +00:00
Julian Stirling
c128ecfcae Apply suggestions from code review of branch rename-rom-thing 2026-06-29 11:55:57 +00:00
Joe Knapper
5811631c4f Stitch 2 images 2026-06-29 12:24:37 +01:00
Julian Stirling
6a571616c9 Change RangeofMotionThing to StageMeasureThing
Also changing the data tracker and name.
2026-06-25 19:53:53 +01:00
Julian Stirling
2dcd386661 Add way for gallery providers to specify bulk actions. 2026-06-25 17:01:07 +01:00
Julian Stirling
c77cef1d9c Improve testing of gallery and behaviour if card data not set for a gallery provider 2026-06-25 10:28:02 +01:00
Julian Stirling
c4ae7f7c90 Only delete selected data types from gallery button. 2026-06-24 17:55:54 +01:00
Julian Stirling
a5828fbf41 Add filtering to gallery 2026-06-24 17:55:54 +01:00
Julian Stirling
d31d1154cc Apply suggestions from code review of branch image-capture
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
2026-06-24 11:35:41 +01:00
Julian Stirling
0e24bb01f4 Add better testing for camera gallery functions 2026-06-23 15:12:38 +00:00
Julian Stirling
03d74bb044 Improve gallery tests and fix behaviour if a provider errors 2026-06-23 15:12:38 +00:00
Julian Stirling
cc6caa39d7 Gallery can delete all data. 2026-06-23 15:12:38 +00:00
Julian Stirling
5a07721fc2 Start showing images in gallery (requires tidy) 2026-06-23 15:12:38 +00:00
Julian Stirling
4d5fd0b698 Provide an API endpoint for camera snapshots rather than relying on legacy. 2026-06-21 13:41:29 +01:00
Joe Knapper
9b12d5ca52 Merge branch 'dots-in-dirs' into 'v3'
Allow dots within filepaths if not trailing.

See merge request openflexure/openflexure-microscope-server!606
2026-06-19 10:47:52 +00:00
Beth Probert
05b802b53e Fix docstring for document generation 2026-06-17 17:11:47 +01:00
Beth Probert
cf6fd4ccea Update to cover new logic. Updatee READMEs and Guides with --debug arg information 2026-06-17 16:59:43 +01:00
Beth Probert
b1202723a1 Fix ruff
Add debug test

Add info log message for sanity

Add more useful logs

Edit configure_logging to change OFM level to debug if set in CLI

Update log message

Fix boot and int mix up

Fix string

Change string

Update logging string again

try changing OFM handler level

Change log slice

Fix syntax error

Add in OFMHandler logic, update webapp to show in logging tab and fix ruff
2026-06-17 16:29:50 +01:00
Beth Probert
b235de39f6 Update customise_server to poll the debug flag in the LT server instead of re-reading the value from CLI arguments. 2026-06-17 12:22:12 +01:00
Julian Stirling
071d62e8a0 Apply suggestions from code review of branch camera_modes
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
2026-06-05 16:58:35 +01:00
Julian Stirling
bc7204f554 Ensure camera controls are read from the camera when changing stream 2026-06-05 16:58:35 +01:00
Julian Stirling
c7d84e2674 Fix HQ camera capture and streaming modes. 2026-06-05 16:58:35 +01:00
Julian Stirling
2faf324a59 Use quick capture for CSM 2026-06-05 16:58:35 +01:00
Julian Stirling
08e58a3c1d Fix docstrings 2026-06-05 16:58:35 +01:00
Julian Stirling
fa21224eaa reinstate capture_to_memory and save_from_memory as actions 2026-06-05 16:58:35 +01:00
Julian Stirling
9dbdad4f8c Fix robust capture logic to break on success 2026-06-05 16:58:35 +01:00
Julian Stirling
29518e9cb9 Update hardware tests and fix PNG saving with picamera 2026-06-05 16:58:35 +01:00
Julian Stirling
cdab10ae46 Tweak types and fix mock persistence between tests 2026-06-05 16:58:35 +01:00
Julian Stirling
2c215b9f81 Add unit tests for RelativeDataPath and save_from_memory 2026-06-05 16:58:35 +01:00
Julian Stirling
c1915759b4 Update unit tests for capture mode. 2026-06-05 16:58:35 +01:00
Julian Stirling
9ed488e37d Complete first pass of capture mode implementation 2026-06-05 16:58:35 +01:00
Julian Stirling
83ceb82ea8 Use a path object that supports setting a Thing for the data directory.
This allows us to ensure that arbitrary paths are not selected via the API.
2026-06-05 16:58:35 +01:00
Julian Stirling
c18d43a3a5 Start to move rest of python onto refactored camera API 2026-06-05 16:58:35 +01:00
Julian Stirling
e3361ebec8 Update cameras inline with base camera rebase 2026-06-05 16:58:35 +01:00
Julian Stirling
feea7135b1 First pass at rebasing for camera modes 2026-06-05 16:58:35 +01:00
Julian Stirling
8367c40b90 rename unvalidated paths from unsafe to unvalidated 2026-06-05 11:32:25 +01:00
Julian Stirling
ef497b8fdd Add comments about PurePath usage 2026-06-05 10:26:20 +00:00
Julian Stirling
0cb37abffe Path checking: Ensure windows outputs original path when warning 2026-06-02 15:02:56 +01:00
Julian Stirling
fe409ccefb Allow dots within filepaths if not trailing. 2026-06-02 14:43:03 +01:00
Julian Stirling
aff860a086 Refactor camera streaming into modes 2026-05-27 08:43:10 +01:00
Joe Knapper
4e58d613d0 Merge branch 'stitch-all-logging' into 'v3'
Log during stitch all and handle errors

Closes #710

See merge request openflexure/openflexure-microscope-server!593
2026-05-15 16:36:15 +00:00
jaknapper
0f842c622b Test stitch all with mocking 2026-05-15 17:07:10 +01:00
Joe Knapper
bea1e35d61 Merge branch 'sharpness-monitor-none' into 'v3'
Sharpness monitor accepting 0 as None

Closes #776

See merge request openflexure/openflexure-microscope-server!592
2026-05-15 15:27:52 +00:00
Joe Knapper
336e052fce Merge branch 'verify-ui-elements' into 'v3'
Verify properties and actions exist before making controls and buttons.

Closes #640

See merge request openflexure/openflexure-microscope-server!556
2026-05-15 15:11:52 +00:00
jaknapper
a278b700ef Change check for record 2026-05-15 15:45:04 +01:00
jaknapper
bd796f98a1 Log during stitch all and handle errors 2026-05-15 15:40:15 +01:00
Julian Stirling
49ae6fcd70 Merge branch 'save-rom-data' into 'v3'
Save useful ROM data to data directory

See merge request openflexure/openflexure-microscope-server!590
2026-05-15 14:16:04 +00:00