Julian Stirling
|
70e7a21a29
|
Starting to refactor smart scan to rely on class variables
|
2025-04-09 22:55:35 +01:00 |
|
Julian Stirling
|
ff1184d453
|
Handle errors in capture thread
|
2025-04-09 22:45:18 +01:00 |
|
Julian Stirling
|
5dd23f6ef4
|
Merge branch 'scanning-cleanup' into 'v3'
Scanning cleanup
See merge request openflexure/openflexure-microscope-server!239
|
2025-04-09 17:13:59 +00:00 |
|
Joe Knapper
|
1d5d67f35a
|
Split out background detect into a new file
|
2025-04-09 17:25:19 +01:00 |
|
Joe Knapper
|
f4db9b6e52
|
Removed commented out code and unused functions
|
2025-04-09 15:32:13 +01:00 |
|
jaknapper
|
a5d1f1e965
|
Removed commented out code
|
2025-04-09 15:11:26 +01:00 |
|
jaknapper
|
e28a160b22
|
Ruff formatting adding commas
|
2025-04-09 14:59:20 +01:00 |
|
jaknapper
|
8d14aee27c
|
Breaking out capture and save code into three seperate methods
|
2025-04-09 13:20:06 +01:00 |
|
Joe Knapper
|
6ec7487001
|
Merge branch 'inverse_colours' into 'v3'
Inverse colours
See merge request openflexure/openflexure-microscope-server!236
|
2025-04-09 11:08:59 +00:00 |
|
jaknapper
|
9c2ab977c5
|
Removed imports and variable to pass Ruff linting
|
2025-04-08 19:07:23 +01:00 |
|
jaknapper
|
52532a90d7
|
More spacing below buttons
|
2025-04-08 18:41:11 +01:00 |
|
jaknapper
|
4fa2813e6a
|
More spacing and nicer dark mode colours
|
2025-04-08 18:30:40 +01:00 |
|
jaknapper
|
574aa1c6c0
|
Only grab a JPEG from the stream to get scanning working
|
2025-04-08 17:52:55 +01:00 |
|
Joe Knapper
|
d4247235e3
|
Merge branch 'csm-return-to-start' into 'v3'
CSM always returns to start on error
See merge request openflexure/openflexure-microscope-server!227
|
2025-04-08 12:49:38 +00:00 |
|
Joe Knapper
|
bf82f37c47
|
Dependency bump for camera_stage_mapping to 0.1.8
Returns the errors we expect
|
2025-04-08 12:09:15 +00:00 |
|
Joe Knapper
|
e4ef8b2717
|
Merge branch 'consistent-logging' into 'v3'
Stop uvicorn.run disabling existing loggers
Closes #284
See merge request openflexure/openflexure-microscope-server!228
|
2025-04-08 11:31:33 +00:00 |
|
Joe Knapper
|
2cffe21727
|
Merge branch 'background-UV' into 'v3'
Use the UV channels only to determine if an area is background or sample
Closes #300
See merge request openflexure/openflexure-microscope-server!211
|
2025-04-08 10:30:17 +00:00 |
|
Julian Stirling
|
a4390255db
|
Merge branch 'reorder_tabs' into 'v3'
Reorder tabs
See merge request openflexure/openflexure-microscope-server!231
|
2025-04-08 10:27:18 +00:00 |
|
jaknapper
|
b340da488e
|
Use the UV channels only to determine if an area is background or sample
|
2025-04-08 11:14:17 +01:00 |
|
Julian Stirling
|
3dab8f09a4
|
Merge branch 'purge-windows-line-endings' into 'v3'
Purge all windows line endings and add check to formatter.
Closes #317
See merge request openflexure/openflexure-microscope-server!232
|
2025-04-08 10:07:14 +00:00 |
|
Julian Stirling
|
1493f51212
|
Purge all windows line endings and add check to formatter.
Also changes python version in pyproject.toml as it is incorrect
|
2025-04-08 10:51:26 +01:00 |
|
Julian Stirling
|
3a47151694
|
Serve logfile and logs for UI seperately
|
2025-04-07 23:45:19 +01:00 |
|
Julian Stirling
|
70d9e2f758
|
Add custom log handler for sending logs to UI
|
2025-04-07 23:16:00 +01:00 |
|
jaknapper
|
421d4a5f10
|
Spaces in tab names, more space, centred
|
2025-04-07 18:54:30 +01:00 |
|
jaknapper
|
3e82286245
|
Reorder GUI tabs to match the order of use
|
2025-04-07 18:18:16 +01:00 |
|
jaknapper
|
33c74741fe
|
Fixed import and re-raise cancelled error
|
2025-04-07 15:46:20 +01:00 |
|
Joe Knapper
|
a506625e40
|
Treat cancellation and other errors differently
|
2025-04-07 14:22:43 +01:00 |
|
Joe Knapper
|
9995e5b3bb
|
Import custom Mapping error from camera_stage_mapping
|
2025-04-07 14:18:07 +01:00 |
|
Julian Stirling
|
dd0b30df51
|
Stop uvicorn.run disabling existing loggers
|
2025-04-06 15:26:39 +01:00 |
|
jaknapper
|
67443ff939
|
Capture ValueErrors, which covers most CSM errors, not all Exceptions
|
2025-04-03 13:52:04 +01:00 |
|
jaknapper
|
46d513d9e6
|
Catch cancelled and other errors in single line
|
2025-04-02 18:25:35 +01:00 |
|
Julian Stirling
|
26d488e75f
|
Merge branch 'exposure-time-name' into 'v3'
Rename exposure (with limit)
See merge request openflexure/openflexure-microscope-server!225
|
2025-04-02 17:09:26 +00:00 |
|
Joe Knapper
|
79b396a66f
|
CSM always returns to start on error
|
2025-04-02 17:54:12 +01:00 |
|
Julian Stirling
|
550c977f59
|
Merge branch 'split-ruff-ci' into 'v3'
Split up ruff format and lint
See merge request openflexure/openflexure-microscope-server!226
|
2025-04-02 13:41:35 +00:00 |
|
Julian Stirling
|
32f2a7ce70
|
Fix spurious line endings, don't allow ruff-format to fail anymore
|
2025-04-02 14:25:22 +01:00 |
|
Julian Stirling
|
928d5ef300
|
Try pinning pydantic version as server now fails tests with error
|
2025-04-02 14:05:38 +01:00 |
|
Julian Stirling
|
336b504377
|
Split up ruff format and lint allowing format to fail
|
2025-04-02 13:39:12 +01:00 |
|
jaknapper
|
01d906e46a
|
Rename exposure (with limit)
|
2025-04-02 13:02:01 +01:00 |
|
Julian Stirling
|
9fb417e4e6
|
Edit v3 branch readme as we make it the Default branch to point people to master if they are looking for v2 code
|
2025-02-21 10:40:25 +00:00 |
|
Richard Bowman
|
e8ae496d08
|
Use published packages
I've published [pre]releases on PyPI. This commit uses the mos recent releases of labthings-picamera2 and camera-stage-mapping.
|
2024-12-18 14:26:15 +00:00 |
|
Richard Bowman
|
83e10b125b
|
Fix return type annotation for autofocus
|
2024-12-18 14:23:58 +00:00 |
|
Richard Bowman
|
db11e03321
|
Constrain numpy < 2
picamera2 fails to import with numpy 2.
|
2024-12-18 14:23:44 +00:00 |
|
Richard Bowman
|
d9c8a083fd
|
Merge branch 'v3-ci-and-tests' into 'v3'
Add more unit tests and fix CI
See merge request openflexure/openflexure-microscope-server!194
|
2024-12-03 14:42:48 +00:00 |
|
Richard Bowman
|
1d59cddac1
|
Disable pytest code quality report
Code quality report plugin clashes with the version of pytest specced in labthings.
If we resolve this upstream, we can re-enable it.
|
2024-12-03 14:19:36 +00:00 |
|
Richard Bowman
|
c3cd30b642
|
Only rebuild docker for changes
Docker is now only rebuilt when it's changed, and on `v3` branch.
I've also added code quality reporting for pytest.
|
2024-12-03 12:54:34 +00:00 |
|
Richard Bowman
|
71e6d84aa4
|
Build docker image and run ruff/pytest
|
2024-12-03 12:18:45 +00:00 |
|
Richard Bowman
|
77794c94eb
|
Update documentation on dependencies/dev tools
|
2024-12-03 11:18:24 +00:00 |
|
Richard Bowman
|
9fd8fc37f1
|
Formatted with Ruff
|
2024-12-03 06:46:08 +00:00 |
|
Richard Bowman
|
27aec769a2
|
Linter fixes
NB I have permitted bare except: blocks in smart_scan. This should be reverted.
|
2024-12-03 06:43:45 +00:00 |
|
Richard Bowman
|
57177c6a56
|
Sped up camera and got CSM passing
Using lower resolution helps speed it up, and skipping CSM settling time makes a big difference.
|
2024-12-03 06:35:16 +00:00 |
|