Commit graph

3443 commits

Author SHA1 Message Date
Joe Knapper
3b5df818d3 Merge branch 'calibration_modal_button' into 'v3'
Button added to launch calibration menu manually

Closes #532

See merge request openflexure/openflexure-microscope-server!360
2025-08-13 10:23:06 +00:00
Chish36
eb496e4cee Removed first menu from force show and created restart method 2025-08-12 19:08:30 +01:00
Chish36
e1aca0bef7 Button added to launch calibration menu manually 2025-08-12 18:02:30 +01:00
Julian Stirling
f39f8f02bd Merge branch 'adding-extra-ruff-checkers' into 'v3'
Add flake8 bugbear checks

See merge request openflexure/openflexure-microscope-server!358
2025-08-12 16:00:30 +00:00
Julian Stirling
4f50f8b2cf Update picamera coverage 2025-08-12 15:28:19 +01:00
Julian Stirling
59224fe726 Remove unneded eumerates 2025-08-12 15:15:02 +01:00
Julian Stirling
6142a267db Add flake8 bugbear checks 2025-08-12 13:09:43 +01:00
Julian Stirling
7ea92ad55f Merge branch 'no-labthings-dev-deps' into 'v3'
No longer use LabThings-FastAPI dev dependencies

See merge request openflexure/openflexure-microscope-server!356
2025-08-11 11:54:20 +00:00
Julian Stirling
c98fd8ab6a No longer use LabThings-FastAPI dev dependencies 2025-08-11 11:56:26 +01:00
Julian Stirling
5b1de28921 Merge branch 'navigate_to_control' into 'v3'
Changed navigate tab to control tab

Closes #469

See merge request openflexure/openflexure-microscope-server!355
2025-08-11 10:23:38 +00:00
Chish36
8ffc4e23a7 Changed comments referring to panelnavigate.vue 2025-08-11 10:40:37 +01:00
Chish36
1d923798e6 Changed navigate to control and updated file names to match. 2025-08-11 09:55:31 +01:00
Julian Stirling
c023449b75 Merge branch 'final-v3-alpha2-things' into 'v3'
Final v3 alpha2 things

See merge request openflexure/openflexure-microscope-server!354
2025-08-08 12:46:09 +00:00
Julian Stirling
8d86645afe Update changelog, plus script to help with updating changelog 2025-08-08 12:34:52 +01:00
Julian Stirling
058f890c61 Update version numbers for v3 alpha2 release 2025-08-08 11:58:14 +01:00
Julian Stirling
3d7438ed2b Merge branch 'stitch-tile-size' into 'v3'
Update to stitching 0.2

See merge request openflexure/openflexure-microscope-server!352
2025-08-08 10:29:43 +00:00
Julian Stirling
c9cb0c65e1 Merge branch 'faster-stage-tests' into 'v3'
Speed up `tests/test_stage.py` significantly

See merge request openflexure/openflexure-microscope-server!353
2025-08-08 10:17:15 +00:00
jaknapper
c64fa4e05b Update stitching to 0.2 2025-08-08 10:49:05 +01:00
jaknapper
f9f28b3500 Update tests 2025-08-08 10:44:03 +01:00
jaknapper
7cedd31ff4 Default tile size 8192 2025-08-08 10:43:54 +01:00
Julian Stirling
3a4b99df55 Apply suggestions from code review of branch faster-stage-tests
Co-authored-by: Beth Probert <beth_probert@outlook.com>
2025-08-08 09:32:31 +00:00
Julian Stirling
90dbb35a9e Directly call DummyStage instance during movement test for speed 2025-08-08 09:52:23 +01:00
jaknapper
279055108f Set final stitch tile size to 4096px 2025-08-07 18:30:14 +01:00
Julian Stirling
bc103f8cdf Merge branch 'yet-another-smart-scan-refactor' into 'v3'
Break up SmartScan further so it can be tested

Closes #482 and #311

See merge request openflexure/openflexure-microscope-server!342
2025-08-07 15:03:52 +00:00
Julian Stirling
dbdf254154 Fix CLI arg for FinalStitcher, and a docstring typo. 2025-08-07 15:20:14 +01:00
Julian Stirling
5caae613dc Apply suggestions from code review of branch yet-another-smart-scan-refactor
Co-authored-by: Beth Probert <beth_probert@outlook.com>
2025-08-07 13:55:47 +00:00
Julian Stirling
7727d0a51d Update language in BaseStitcher to clarify that the stitching uses subprocess not threading 2025-08-07 12:06:58 +01:00
Julian Stirling
cd311f08bf Update stiching to differentiate bwtween stitchers that use a thread and those that block 2025-08-06 17:47:33 +01:00
Julian Stirling
5f092835ac Apply suggestions from code review of branch yet-another-smart-scan-refactor 2025-08-06 17:27:26 +01:00
Julian Stirling
2e6ba73345 Apply suggestions from code review of branch yet-another-smart-scan-refactor
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
2025-08-06 17:27:26 +01:00
Julian Stirling
6739a84d7c Apply suggestions from code review of branch yet-another-smart-scan-refactor
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
2025-08-06 17:27:26 +01:00
Julian Stirling
f9fcdf628b Squash final todos for SmartScan refactor 2025-08-06 17:27:26 +01:00
Julian Stirling
7d83aadf8d Squash some TODOs 2025-08-06 17:27:26 +01:00
Julian Stirling
4e9b07c78f Consolidate information into ScanData, remove ad-hoc differences for specific error in _run_scan 2025-08-06 17:27:26 +01:00
Julian Stirling
82691a6b78 Tweak error reporting in _run_scan and add a lot more testing for _run_scan 2025-08-06 17:27:26 +01:00
Julian Stirling
d7a7ac4c7d More complete testing of code that runs stitching subprocess. 2025-08-06 17:27:26 +01:00
Julian Stirling
cf74ea1351 More complete testing of code that runs stitching subprocess. 2025-08-06 17:27:26 +01:00
Julian Stirling
7569c7d6b2 Add validation checks to prevent arbitrary code execution via stitching. 2025-08-06 17:27:26 +01:00
Julian Stirling
a632ddee92 Add unit tests for generated stitching commands. 2025-08-06 17:27:26 +01:00
Julian Stirling
573fc20dec Add new tests new scan directory function and for scan data serialisation 2025-08-06 17:27:26 +01:00
Julian Stirling
6ceb1a9845 Pull stitching out of SmartScanThing 2025-08-06 17:27:26 +01:00
Julian Stirling
f449bcdd78 Turn scan_data into a BaseModel with validation for custom formatting 2025-08-06 17:27:26 +01:00
Julian Stirling
d80d08dd83 Merge branch 'pull-webapp' into 'v3'
Pull webapp

Closes #512

See merge request openflexure/openflexure-microscope-server!347
2025-08-06 16:11:01 +00:00
Julian Stirling
73beb2b09d Merge branch 'fix-movements' into 'v3'
Fix movements axes

Closes #498

See merge request openflexure/openflexure-microscope-server!338
2025-08-06 15:50:08 +00:00
Julian Stirling
ac98205391 Apply suggestions from code review of branch pull-webapp
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
2025-08-06 15:27:02 +00:00
jaknapper
2f21fd6200 Describe expected behaviour in stage settings 2025-08-06 15:57:00 +01:00
Julian Stirling
7a241f30a1 Update developer guidance in README 2025-08-06 15:05:33 +01:00
Julian Stirling
25e41dbff4 Add script to pull webapp from CI artifacts 2025-08-06 15:04:11 +01:00
jaknapper
772a4c4301 Remove z key invert option
More space between invert options and Zero button

Rename Step Size to Keyboard Step Size
2025-08-06 14:21:49 +01:00
Julian Stirling
0921a73a81 Merge branch 'simulation-scanning' into 'v3'
Scanning in simulation

Closes #395

See merge request openflexure/openflexure-microscope-server!344
2025-08-06 13:11:14 +00:00