Commit graph

4353 commits

Author SHA1 Message Date
Beth Probert
f67699fbc8 Raise warnings if there are unsafe file path elements rather than coercing file paths. Stitching still raises an error if your file name is unsafe 2026-03-09 13:54:43 +00:00
Beth Probert
2395234322 Merge branch 'v3' into 523-improve-validation-checks 2026-03-06 16:11:19 +00:00
Julian Stirling
ba8de65fd2 Merge branch 'codespell-update' into 'v3'
Fix spellings found as codespell updates

See merge request openflexure/openflexure-microscope-server!526
2026-03-06 16:10:17 +00:00
Beth Probert
349485d43b Remove multi-underscores from allowed names 2026-03-06 15:52:50 +00:00
Beth Probert
2c2f97cb56 Force file names to be lower case to avoid Windows issues around case sensitivity when checking if a file already exists. Path names can be uppercase as these will be defined on a users system and pre-exist. Files are created by us so we can force sanitation 2026-03-06 15:37:01 +00:00
Julian Stirling
011fc5a795 Fix spellings found as codespell updates 2026-03-06 15:06:53 +00:00
Beth Probert
35f7adcf07 Codespell 2026-03-06 14:16:42 +00:00
Beth Probert
4395d4001c Allow relative imports with two dots at start of path. Update unit tests. 2026-03-06 14:13:00 +00:00
Beth Probert
e5429d6cda Change make_path_safe to allow single dot relative imports, but no dots anywhere else. Added new unit tests for this. 2026-03-06 14:07:07 +00:00
Beth Probert
713df248ff Add underscores to fix unit test 2026-03-06 09:53:41 +00:00
Julian Stirling
f7cb84bff5 Merge branch 'align-modal' into 'v3'
Align buttons in confirmation modal

Closes #709

See merge request openflexure/openflexure-microscope-server!525
2026-03-06 09:42:18 +00:00
Joe Knapper
76e80b299f Align buttons in confirmation modal 2026-03-05 16:36:10 +00:00
Beth Probert
7a17c92d3e Apply suggestions from code review of branch 523-improve-validation-checks
Co-authored-by: Julian Stirling <julian@julianstirling.co.uk>
2026-03-05 15:13:42 +00:00
Beth Probert
f52ce85b3e Ruff formatting 2026-03-05 14:04:33 +00:00
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