Commit graph

3046 commits

Author SHA1 Message Date
Julian Stirling
deeb164f29 Change from building with node 15 (end of life 2021) to node 18 (just gone EOL, but used on the Pi) 2025-06-05 11:16:53 +00:00
Julian Stirling
16317bf94c Merge branch 'fix-simulation' into 'v3'
Simulation fixes

See merge request openflexure/openflexure-microscope-server!279
2025-06-05 10:35:53 +00:00
Joe Knapper
c919f8a19f Logging config based on default uvicorn settings 2025-06-03 14:48:13 +01:00
Julian Stirling
4ef74c42c3 Configure log folder in json file 2025-06-03 14:05:58 +01:00
Julian Stirling
090373f1ef Merge branch 'bump-labthings-picamera' into 'v3'
update labthings-picamera to most recent release

Closes #301

See merge request openflexure/openflexure-microscope-server!278
2025-06-02 15:07:05 +00:00
Joe Knapper
0132813b6a update labthings-picamera to most recent release 2025-06-02 14:40:06 +00:00
Julian Stirling
7c30f7a720 Adjust simulation config to match full config updates, fix .gitignore 2025-06-01 20:06:45 +02:00
Julian Stirling
58a4dc521d Merge branch 'gui-dzi-viewer' into 'v3'
Gui dzi viewer

See merge request openflexure/openflexure-microscope-server!266
2025-05-23 15:45:30 +00:00
jaknapper
943564d206 Alert and warning message as CSS classes 2025-05-23 16:28:22 +01:00
jaknapper
e52dedf0fe Remove padding around viewer, warnings in orange, stitch button if no DZI 2025-05-23 16:28:22 +01:00
jaknapper
a499d9230c Switch to updated "preview stitch" mode in stitching 2025-05-23 16:28:22 +01:00
Joe Knapper
4f98e17b5f Only open preview from button or thumbnail, warn if no DZI available, recentre list 2025-05-23 16:28:22 +01:00
jaknapper
51e2d420ac Update package-lock.json 2025-05-23 16:28:22 +01:00
jaknapper
a9b94bc0d8 OpenSeadragon viewer implemented 2025-05-23 16:28:21 +01:00
jaknapper
cc3620d2ed Stitch with dzi by default, and check for dzi available in scans() 2025-05-23 16:28:21 +01:00
jaknapper
efe2127afb Mount scans to app on startup 2025-05-23 16:28:21 +01:00
Julian Stirling
b88487af78 Merge branch 'fix-purge-empty-scans' into 'v3'
Fix error in purge_empty_scans if the `images` dir hadn't been created

Closes #386

See merge request openflexure/openflexure-microscope-server!277
2025-05-23 12:36:04 +00:00
Julian Stirling
fe1696df28 Fix error in purge_empty_scans if the images dir hadn't been created 2025-05-23 12:49:46 +01:00
Julian Stirling
ead9c97f69 Merge branch 'ui-fixes' into 'v3'
Ui fixes

See merge request openflexure/openflexure-microscope-server!276
2025-05-23 11:25:34 +00:00
Julian Stirling
70f4304b2e Fix bug where .jpg files are not counted in scan list (only .jpeg) 2025-05-23 11:45:26 +01:00
Julian Stirling
8318d9daad Fix bug where View pane isn't loaded when app is first opened 2025-05-23 11:45:16 +01:00
Joe Knapper
10379b97f8 Merge branch 'shutdown-in-gui' into 'v3'
GUI shutdown clean up

Closes #372, #373, and #382

See merge request openflexure/openflexure-microscope-server!275
2025-05-22 16:13:53 +00:00
Joe Knapper
69acc8a0ea Edit settingsContent.vue 2025-05-22 15:56:25 +00:00
jaknapper
14672c260f Dedicated power menu 2025-05-22 16:46:30 +01:00
jaknapper
27ed10e27f Move shutdown and restart to settings tab, hard set server version to prealpha 2025-05-22 15:11:25 +01:00
jaknapper
57840ab979 Force OK to be capitalised in confirmation modals 2025-05-22 15:10:16 +01:00
Joe Knapper
816cfd3220 Merge branch 'csm_data_in_gui' into 'v3'
CSM info in webapp tab

See merge request openflexure/openflexure-microscope-server!261
2025-05-21 15:21:55 +00:00
Joe Knapper
8431cd1d15 Merge branch 'settling_before_stack' into 'v3'
Settling time as global, settle before taking first image in stack

See merge request openflexure/openflexure-microscope-server!272
2025-05-21 15:16:14 +00:00
Joe Knapper
931554226e Combine xlarge width with updated heading 2025-05-21 15:05:50 +00:00
jaknapper
c0cf95bac1 Widen the info area of the CSM tab to use space more efficiently and not break lines (tested on three screens) 2025-05-21 15:56:50 +01:00
jaknapper
b66912ac8f CSM settings hidden by default in a details section 2025-05-21 15:56:04 +01:00
jaknapper
b812c6be35 Settling time as global, settle before taking first image in stack 2025-05-21 15:41:49 +01:00
Julian Stirling
6332c8b647 Merge branch 'openflexure-stitching-from-pip' into 'v3'
Import openflexure-stitching from pip

See merge request openflexure/openflexure-microscope-server!270
2025-05-21 10:00:48 +00:00
jaknapper
44f2435ea4 Removed stitching path as kwarg for scanning 2025-05-21 10:30:42 +01:00
Julian Stirling
c793620fcd Merge branch 'cleanup_empty_scans' into 'v3'
Added purge_empty_scans() method

Closes #370

See merge request openflexure/openflexure-microscope-server!257
2025-05-20 18:26:00 +00:00
Joe Knapper
6c8c8bf358 Apply 1 suggestion(s) to 1 file(s)
Co-authored-by: Julian Stirling <julian@julianstirling.co.uk>
2025-05-20 17:04:48 +00:00
jaknapper
576161e543 Import openflexure-stitching from pip, updated toml and config jsons 2025-05-20 17:54:17 +01:00
Joe Knapper
4251360290 Merge branch 'manual-errors' into 'v3'
Action buttons raise an Error from the last message in the log for the Action

See merge request openflexure/openflexure-microscope-server!269
2025-05-20 15:41:19 +00:00
jaknapper
4a44dceac6 More clear variable name, use _delete_scan to avoid calling fastapi-endpoint in loops 2025-05-20 16:36:57 +01:00
Joe Knapper
67c5c74753 Updated comment, test most recent log is ERROR 2025-05-20 16:20:35 +01:00
Joe Knapper
9d5e6b5334 Default error messages if the log is empty, or the log message is empty 2025-05-20 16:11:04 +01:00
Joe Knapper
852a003fae Action buttons raise an Error from the last message in the log for the Action 2025-05-20 15:16:38 +01:00
Joe Knapper
0b2aaa9c92 Merge branch 'lower-case-gui' into 'v3'
GUI clean up - button cases, features tab and redo tour

Closes #381

See merge request openflexure/openflexure-microscope-server!268
2025-05-20 13:15:58 +00:00
Joe Knapper
0eed51f486 STEP SIZE to title case 2025-05-20 13:10:57 +01:00
Joe Knapper
3ca86ec4b4 Remove features tab, as neither option works with v3. Does not remove underlying code (seperate issue) 2025-05-20 13:06:09 +01:00
Joe Knapper
625f9b4001 Ttile case in all buttons and properties, larger settings headers 2025-05-20 12:59:49 +01:00
Joe Knapper
241b2ca463 Merge branch 'inverse-colour-alert' into 'v3'
Update theme.less to prevent automatic changed colour of uk-alert-success

See merge request openflexure/openflexure-microscope-server!267
2025-05-16 15:30:08 +00:00
jaknapper
8c7b800983 Update theme.less to prevent automatic changed colour of uk-alert-success 2025-05-16 15:18:33 +01:00
Julian Stirling
8f45a9e9a9 Merge branch 'update_serve_static_files' into 'v3'
Update serve static files

See merge request openflexure/openflexure-microscope-server!265
2025-05-15 16:30:38 +00:00
Joe Knapper
a563c634a3 Update serve static files to serve correct directory and to add docstrings 2025-05-15 16:30:37 +00:00