Commit graph

3222 commits

Author SHA1 Message Date
Julian Stirling
5e6aeb9bbf Move SangaboardThing into repo 2025-07-02 16:42:38 +01:00
Julian Stirling
248f43d0fc Merge branch 'remove-test-thing' into 'v3'
Remove test Thing that is is never used.

See merge request openflexure/openflexure-microscope-server!310
2025-07-02 15:02:07 +00:00
Julian Stirling
3fd1e46297 Merge branch 'unique-len' into 'v3'
Combine uniquness and length checks

See merge request openflexure/openflexure-microscope-server!309
2025-07-02 13:55:01 +00:00
Julian Stirling
ffd958f823 Remove test Thing that is is never used. 2025-07-02 14:33:23 +01:00
Beth Probert
e936dc2974 Apply suggestions from code review of branch unique-len 2025-07-02 13:12:10 +00:00
Julian Stirling
8a28a17461 Combine uniquness and length checks 2025-07-02 13:25:07 +01:00
Julian Stirling
35409ee490 Merge branch 'download-stitched-image' into 'v3'
Allow downloading just the stitched image, and don't zip DZIs

Closes #441

See merge request openflexure/openflexure-microscope-server!305
2025-07-02 10:21:23 +00:00
Beth Probert
f3a873ae58 Apply suggestions from code review of branch download-stitched-image
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
2025-07-02 09:51:27 +00:00
Julian Stirling
2e18c2017a Apply suggestions from code review of branch download-stitched-image
Co-authored-by: Beth Probert <beth_probert@outlook.com>
2025-07-02 09:39:33 +00:00
Julian Stirling
7295b86cf6 Split up ScanDirectory._find_files into seperate functions 2025-07-01 19:45:45 +01:00
Julian Stirling
254305a7a5 Clarify whether name or path is returned in scan directory functions 2025-07-01 19:21:56 +01:00
Julian Stirling
9b78b4620d Fix disabled HTML button and apply code review suggestions for branch download-stitched-image
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
2025-07-01 12:20:40 +01:00
Julian Stirling
75eac81b80 rename css disabled property to make it button specific, adjust darkmode disabled css 2025-07-01 11:16:25 +01:00
Julian Stirling
3671d52499 Do not zip DZI files, or their associated tiles 2025-07-01 09:04:14 +01:00
Julian Stirling
daf2cee481 Add tests and correct stitch path 2025-06-30 23:03:54 +01:00
jaknapper
ceefc83229 Better checking of whether we can stitch 2025-06-30 20:18:51 +01:00
jaknapper
987807ec3b Custom EndpointButton, Download logs using EndpointButton 2025-06-30 20:18:51 +01:00
jaknapper
ff43deae36 Download stitched image of scan (if present)
* Docstring for download stitch
* use global STITCH_SUFFIX
2025-06-30 20:18:48 +01:00
jaknapper
62065dc385 Add download stitch button to GUI 2025-06-30 20:17:15 +01:00
Julian Stirling
31898122d7 Merge branch 'webapp-package-fix' into 'v3'
Replace semi colon with double ampersand in package.json

See merge request openflexure/openflexure-microscope-server!308
2025-06-30 17:31:02 +00:00
Julian Stirling
63ec8fd873 Merge branch 'split-scan-dir-operations' into 'v3'
Trying to make a distinction between file directory operations for scans and scanning code

Closes #328

See merge request openflexure/openflexure-microscope-server!294
2025-06-30 17:04:23 +00:00
jaknapper
687ef8a00e Replace semi colon with double ampersand, which is platform agnostic AND 2025-06-30 17:57:16 +01:00
Julian Stirling
51f9df995d More changes suggested in review, generally docstring issues. 2025-06-30 17:25:58 +01:00
Julian Stirling
ad838e8643 Apply suggestions from code review of branch split-scan-dir-operations
Co-authored-by: Beth Probert <beth_probert@outlook.com>
2025-06-30 17:25:58 +01:00
Julian Stirling
a6e48f8882 Update webapp to accept scan time as timestamp not ISO 8601 datestring 2025-06-29 23:17:17 +01:00
Julian Stirling
7f0745d772 Add some more scan_directories tests 2025-06-28 23:59:35 +01:00
Julian Stirling
7193ec34f5 Starting to test more smart scan functionality using mocked Thing Dependencies 2025-06-27 21:06:16 +01:00
Julian Stirling
3aa9b9100a Add a number of tests for scan directories and fix bugs 2025-06-27 21:06:16 +01:00
Julian Stirling
1267d881b9 Start writing tests for smart scan
Focusing on methods that don't start the whole scan.
2025-06-27 21:06:16 +01:00
Julian Stirling
32f78a4cff Trying to make a distinction between file directory operations for scans and scanning code
This started as a small change and spiralled out of control it needs good unit tests and testing
before considering to merge
2025-06-27 21:06:16 +01:00
Julian Stirling
0d2f324324 Split creation of scan directory information into class with small testable methods 2025-06-27 21:06:16 +01:00
Julian Stirling
3e0264bcbc Merge branch 'fast-stack' into 'v3'
A stack that tests whether the sharpest image is towards the middle

See merge request openflexure/openflexure-microscope-server!271
2025-06-27 20:02:36 +00:00
Julian Stirling
8002600fcf Apply suggestions from code review of branch fast-stack
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
2025-06-27 16:40:18 +00:00
Julian Stirling
9a92fd478a Final docstring and testing updates based on code review 2025-06-27 16:54:28 +01:00
Julian Stirling
46f3d21632 Apply suggestions from code review of branch fast-stack
Co-authored-by: Beth Probert <beth_probert@outlook.com>
2025-06-27 11:52:53 +01:00
Julian Stirling
fc6c13f40e Apply suggestions from code review of branch fast-stack
Co-authored-by: Beth Probert <beth_probert@outlook.com>
2025-06-27 10:41:53 +00:00
Julian Stirling
73e54b802b Stop smart stack infinietly looping 2025-06-27 01:29:26 +01:00
Julian Stirling
e90ff73499 Move smart stack specific scan planning logic to SmartSpiral 2025-06-27 01:08:55 +01:00
Julian Stirling
2ce2f998fa add tests for helper classes defined by fast stack 2025-06-27 00:34:51 +01:00
Julian Stirling
05af5e7548 Write unit teasts for CameraMemoryBuffer and fix minor issues found 2025-06-26 22:49:09 +01:00
Julian Stirling
2aea6a2569 Docstrings and stop using Pydantic for ScanParameters 2025-06-26 19:46:25 +01:00
Julian Stirling
43d5f2fdfe Change capture_resolution to save resolution, because it is used for saving not capture 2025-06-26 19:00:52 +01:00
Julian Stirling
6a87805b47 Fixing a number of issues from the merge and refactor. 2025-06-26 18:29:12 +01:00
Julian Stirling
61dd5e4958 Compete first (untested) pass of trying to make fast stack compatible with new memory captures 2025-06-26 17:43:11 +01:00
Julian Stirling
fda0a6e1ab Merge branch 'v3' into fast-stack, with conflict resolution but not fully
working yet
2025-06-26 11:50:24 +01:00
Joe Knapper
378998d230 Merge branch 'jpeg-capture-in-stacking' into 'v3'
2MP from 8MP capturing

Closes #364, #413, #298, #303, #288, #358, and #433

See merge request openflexure/openflexure-microscope-server!251
2025-06-25 17:57:51 +00:00
Joe Knapper
b49aecb802 Apply suggestions from code review of branch jpeg-capture-in-stacking 2025-06-25 17:32:05 +00:00
Julian Stirling
761957d7fb Clarify exposure variables in docstring 2025-06-25 17:53:43 +01:00
Julian Stirling
0389ab760a Apply suggestions from code review of branch jpeg-capture-in-stacking
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
2025-06-25 16:52:23 +00:00
Julian Stirling
ee8c58c99f Docstrings, typehints, and clarifications in PiCamera and its utils 2025-06-25 17:36:11 +01:00