Commit graph

4339 commits

Author SHA1 Message Date
Beth Probert
35efba19b8 Use pytest parametrize for better coverage of forbidden commands and reserved names 2026-03-05 13:55:05 +00:00
Beth Probert
fa9ea77812 Ruff check 2026-03-05 13:42:55 +00:00
Beth Probert
48f6e1b369 Allow python and python3 as stitching commands. They are allowed. Move stitching tests into one file 2026-03-05 13:35:21 +00:00
Beth Probert
98e71207c5 Add forbidden windows commands to stitching and utilities to check for file name sanitation. Unit tests also added 2026-03-05 13:03:17 +00:00
Joe Knapper
a988b726f5 Merge branch 'lower-target-brightness' into 'v3'
Decrease target brightness for both cameras as its pre-gamma

Closes #621

See merge request openflexure/openflexure-microscope-server!491
2026-03-05 10:59:07 +00:00
Julian Stirling
5fab6825e2 Update picamera tests 2026-03-04 22:47:01 +00:00
Joe Knapper
84f3032022 Update docstrings to explain lower brightness 2026-03-04 20:52:49 +00:00
jaknapper
e324014a81 Increase target exposure to 40% 2026-03-04 20:52:49 +00:00
Joe Knapper
75ca73f148 Decrease target brightness for both cameras as its pre-gamma 2026-03-04 20:52:49 +00:00
Julian Stirling
8dc7d1cb56 Merge branch 'data-directory' into 'v3'
Create and mount application level data directory rather than just a scan directory

Closes #595 and #697

See merge request openflexure/openflexure-microscope-server!503
2026-03-04 20:10:06 +00:00
Julian Stirling
a7a61971d3 Update picamera tests 2026-03-04 17:27:59 +00:00
Julian Stirling
3a9340f6e0 Update scan directory in webapp 2026-03-04 17:22:03 +00:00
Julian Stirling
ec27b7d5c5 Update integration tests for application_config 2026-03-04 17:22:03 +00:00
Julian Stirling
7e4ec53d78 Update how the application configuration is read for LabThings 0.0.17 2026-03-04 17:22:03 +00:00
Julian Stirling
45903f92a6 Create and mount application level data direcory rather than just a scan directory 2026-03-04 17:22:03 +00:00
Julian Stirling
2c2a52cb97 Merge branch 'metadata-testing' into 'v3'
Metadata testing

Closes #576 and #575

See merge request openflexure/openflexure-microscope-server!519
2026-03-04 17:19:02 +00:00
jaknapper
7ca94497c7 Remove link from basecamera docstring 2026-03-03 15:32:59 +00:00
jaknapper
9a6f80edf4 Update camera_test with extra key 2026-03-03 14:45:32 +00:00
jaknapper
3020ab59f4 Fix typing for gamma_curve 2026-03-03 14:21:28 +00:00
jaknapper
b716013ef2 Fixed tuning file gamma key to gamma_curve 2026-03-03 14:03:17 +00:00
jaknapper
0173cf912f Add gamma_curve to metadata 2026-03-03 13:59:43 +00:00
jaknapper
17f77e36c4 Picamera test 2026-03-03 13:33:34 +00:00
Joe Knapper
5019884175 Camera metadata includes subclass name, and test 2026-03-03 13:23:30 +00:00
Julian Stirling
ac9852a7ad Merge branch 'less-stack-coersion' into 'v3'
Do less coersion for stacks now labthings validates settings.

See merge request openflexure/openflexure-microscope-server!516
2026-03-03 10:02:05 +00:00
Julian Stirling
0fdcb9b623 Merge branch 'equal-offsets' into 'v3'
Allow histo scans with equal dx and dy

See merge request openflexure/openflexure-microscope-server!517
2026-03-02 22:56:53 +00:00
Julian Stirling
1dce732a9a Always log dx and dy steps for Histoscan 2026-03-02 20:53:16 +00:00
Joe Knapper
c09164a4e3 Apply suggestions from code review of branch equal-offsets
Co-authored-by: Julian Stirling <julian@julianstirling.co.uk>
2026-03-02 20:47:12 +00:00
Joe Knapper
7d3427ad2a Test equal overlaps 2026-03-02 19:31:04 +00:00
Joe Knapper
5a79e4ffd3 Allow histo scans with equal dx and dy 2026-03-02 19:24:20 +00:00
Julian Stirling
dc2bc77dbb Merge branch 'backlash-in-stage' into 'v3'
Backlash correction in base stage class

Closes #420

See merge request openflexure/openflexure-microscope-server!509
2026-03-02 19:10:46 +00:00
Julian Stirling
d7b4457a55 Do less coersion for stacks now labthings validates settings. 2026-03-02 18:19:11 +00:00
Joe Knapper
b57833b033 Merge branch 'event-names' into 'v3'
Change pointer event names for clarity

See merge request openflexure/openflexure-microscope-server!510
2026-03-02 14:54:56 +00:00
Julian Stirling
d4fbcb6d61 Apply suggestions from code review of branch backlash-in-stage
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
2026-03-02 14:40:27 +00:00
Julian Stirling
9ab7e50773 Apply suggestions from code review of branch backlash-in-stage
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
2026-03-02 14:40:27 +00:00
Julian Stirling
0527990282 Use backlash compensation in smart scan and autofocus 2026-03-02 14:40:25 +00:00
Julian Stirling
c12814f0eb Add a load more backlash corrected move test cases. 2026-03-02 14:37:21 +00:00
Julian Stirling
c2b784e606 Add stage backlash correction 2026-03-02 14:37:21 +00:00
Julian Stirling
35819aa826 Track the backlash state of stages 2026-03-02 14:37:21 +00:00
Julian Stirling
6f3cf00b36 Add a base stage method for update_position, splitting out hardware specifics 2026-03-02 14:37:21 +00:00
Julian Stirling
e443b1ac5b Merge branch 'more-dev-docs' into 'v3'
More developer documnetation

See merge request openflexure/openflexure-microscope-server!513
2026-03-02 13:36:18 +00:00
Julian Stirling
d33b67393e Merge branch 'headless-opencv' into 'v3'
Move to headless opencv

See merge request openflexure/openflexure-microscope-server!514
2026-03-02 13:35:42 +00:00
Julian Stirling
ae8285ed28 Merge branch 'opencv-camera-switcher' into 'v3'
Add functionality to switch OpenCV camera without restarting the server.

See merge request openflexure/openflexure-microscope-server!487
2026-03-02 13:25:12 +00:00
Julian Stirling
f425786912 Improve fonts in software diagram if Open Sans not installed 2026-03-02 13:10:17 +00:00
Joe Knapper
61e4c8d8d7 Apply suggestions from code review of branch opencv-camera-switcher
Co-authored-by: Julian Stirling <julian@julianstirling.co.uk>
2026-03-02 12:34:06 +00:00
Julian Stirling
2fee313d42 Apply suggestions from code review of branch opencv-camera-switcher 2026-03-02 11:24:32 +00:00
Julian Stirling
9e48f13d6f Apply suggestions from code review of branch opencv-camera-switcher
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
2026-03-02 11:02:35 +00:00
Julian Stirling
5bd2fb18c5 Move to headless opencv 2026-03-01 22:29:28 +00:00
Julian Stirling
cdfa0b5846 Remove out of date maintainer docs 2026-03-01 12:50:21 +00:00
Julian Stirling
8d3965dcff Always build dev docs 2026-03-01 12:16:07 +00:00
Julian Stirling
bc36a1e9d0 Create a developer guidance section for the hosted docs 2026-03-01 12:15:36 +00:00