Commit graph

4158 commits

Author SHA1 Message Date
Joe Knapper
e0a8eb08c8 Test illumination baseclass 2026-02-12 15:33:58 +00:00
Joe Knapper
bb5cce3d4e Only generate frame if LED is on 2026-02-12 13:54:12 +00:00
Joe Knapper
52c592e35c Merge branch 'More-workflow-layers' into 'v3'
More workflow layers

Closes #628

See merge request openflexure/openflexure-microscope-server!469
2026-02-12 13:49:51 +00:00
Joe Knapper
fdf33ce4a8 Apply suggestions from code review of branch flash-led-sim
Co-authored-by: Julian Stirling <julian@julianstirling.co.uk>
2026-02-12 13:48:12 +00:00
Julian Stirling
18477a663d Define flash in illumination base class 2026-02-12 13:40:20 +00:00
Antonio Anaya
66b0693338 Merge branch 'v3' into 'goal_1'
# Conflicts:
#   webapp/src/components/tabContentComponents/slideScanContent.vue
2026-02-12 11:34:32 +00:00
Antonio Anaya
dfca0ff7e0 ui_migration fix(deps): --preliminary-- Removing deep:true from watchers that are not defined as arrays. Missing type hints in watchers. 2026-02-12 05:03:50 -06:00
Julian Stirling
2a38375040 Consolidate moves_between and total_moves_between into 1 function with switchable metrics 2026-02-12 11:00:03 +00:00
Antonio Anaya
0e6a0c17f4 ui_migration fix(deps): added emiters array for Type safety 2026-02-12 04:37:00 -06:00
Antonio Anaya
869f410dbb ui_migration fix(deps): replacing global emiters to eventBus.emit, on mixings file. 2026-02-12 04:35:38 -06:00
Joe Knapper
3423d4ed0e Test calling base Illumination 2026-02-11 16:28:15 +00:00
Joe Knapper
7da3dbbf8f Test illumination 2026-02-11 16:11:39 +00:00
jaknapper
8081dc9426 Split moves_between to support Manhattan or Chebyshev distance 2026-02-11 15:13:47 +00:00
jaknapper
d0f55786ce Test raster scan planner and z estimate from raster and snake 2026-02-11 15:13:17 +00:00
jaknapper
21f42d4698 Remove flash-led from SangaTest 2026-02-11 12:58:46 +00:00
jaknapper
d4dc113a60 Linter fix in statusPane 2026-02-11 12:12:43 +00:00
Julian Stirling
511b37176e Add clarifying docstring 2026-02-11 11:03:08 +00:00
Julian Stirling
5d5bae7f79 Apply suggestions from code review of branch More-workflow-layers
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
2026-02-11 11:03:08 +00:00
Julian Stirling
af5c8f01da Update scan_planner module docstring 2026-02-11 11:03:08 +00:00
Julian Stirling
351a66a42c Cleaning up workflows and fixing tests. 2026-02-11 11:03:08 +00:00
Julian Stirling
86fa48fb9b Update select_nearby_focus_site to use moves between 2026-02-11 11:03:07 +00:00
Julian Stirling
9e477a26d8 Simplify planners a little to consolidate snake and raster 2026-02-11 10:39:30 +00:00
Joe Knapper
16458db85b Fix simulated imports 2026-02-11 10:26:04 +00:00
Joe Knapper
676d34842a Apply suggestions from code review of branch flash-led-sim
Co-authored-by: Julian Stirling <julian@julianstirling.co.uk>
2026-02-11 10:19:19 +00:00
Joe Knapper
f05cb396c8 Update FlashLED to new endpoint in webapp 2026-02-10 22:20:22 +00:00
Joe Knapper
4d788a2817 Remove flash from stage baseclass, add to sim config 2026-02-10 22:19:49 +00:00
jaknapper
5682b4d28d Illumination Things for sangaboard and simulator 2026-02-10 18:42:59 +00:00
Joe Knapper
8435f6ae98 Move illumination to new IlluminationThing 2026-02-10 18:06:21 +00:00
Julian Stirling
1221b6ca02 Apply suggestions from code review of branch More-workflow-layers
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
2026-02-10 16:40:11 +00:00
Julian Stirling
0e5f9f46ca Fix docstring error 2026-02-10 16:37:32 +00:00
Julian Stirling
15798d9b7d Further layering of the classes for scan workflows 2026-02-10 16:02:18 +00:00
Joe Knapper
1de4366df7 Flash LED endpoint in simulator for parity 2026-02-10 15:59:18 +00:00
jaknapper
1f01717a1b Fix UI workflow test as order changed 2026-02-10 14:24:41 +00:00
jaknapper
f1845c3039 RectangleWorkflow as a baseclass 2026-02-10 14:05:38 +00:00
jaknapper
6294cde471 Fully subclass Rectangle basescanner for raster and snake 2026-02-09 19:35:19 +00:00
Joe Knapper
fb7a8b4959 Prettier on slideScanContent 2026-02-09 18:48:49 +00:00
Joe Knapper
1a0dd71f30 Intermediate level RectangleScan class for all three scanners 2026-02-09 18:48:49 +00:00
Joe Knapper
3beb8e1147 Auto-populate workflow dropdown 2026-02-09 18:48:49 +00:00
Joe Knapper
0177596fb6 Add raster scan, with generic typing to allow subclassed settings 2026-02-09 18:48:49 +00:00
Julian Stirling
9ab5a461c0 Merge branch 'snake-scan' into 'v3'
SnakeScan as a scan planner

See merge request openflexure/openflexure-microscope-server!464
2026-02-09 17:10:12 +00:00
jaknapper
383fc31f22 Add snake-scan to full config 2026-02-09 16:10:29 +00:00
Joe Knapper
eb88e1f1c0 Apply suggestions from code review of branch snake-scan
Co-authored-by: Julian Stirling <julian@julianstirling.co.uk>
2026-02-09 16:05:49 +00:00
Joe Knapper
1c17b27c05 Apply suggestions from code review of branch snake-scan
Co-authored-by: Julian Stirling <julian@julianstirling.co.uk>
2026-02-09 16:05:22 +00:00
Joe Knapper
7413aa57f8 Docstring and typehints suggestions from @julianstirling 2026-02-09 15:08:53 +00:00
Joe Knapper
f230eef2dc New scan workflow for snake scans, move next pos into scan baseclass
Update tests that were testing wrong method, update all to new select_nearby_focus_site
2026-02-09 13:19:10 +00:00
Joe Knapper
e59d5e82d8 mypy fix for coords list 2026-02-09 13:09:09 +00:00
Joe Knapper
b4957e0420 SnakeScan as a scan planner 2026-02-09 13:09:07 +00:00
Antonio Anaya
a16a86f361 ui_migration fix(bugfix): eventBus undefined found caused by not importing eventBus at autofocus comp, removing eventBus usage on child/parent this. events for task polling func 2026-02-09 00:06:48 -06:00
Antonio Anaya
9992ca642c ui_migration fix(bugfix): found caused eventBus/this., and {x,y,z,absolute} parsing arguments incorrectly, BUG:keys-arrows-wont-move prevents @finished emit status for task 2026-02-08 05:29:56 -06:00
Julian Stirling
663a18a38f Merge branch 'scan-workflows' into 'v3'
Implement ScanWorkflows allowing multiple scanning methods

Closes #641, #566, #371, and #333

See merge request openflexure/openflexure-microscope-server!462
2026-02-06 15:21:09 +00:00