Commit graph

3024 commits

Author SHA1 Message Date
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
Julian Stirling
1b6cbd3098 Merge branch 'static_files_cleanup' into 'v3'
Clean up of serve_static_files

See merge request openflexure/openflexure-microscope-server!263
2025-05-15 13:30:17 +00:00
jaknapper
d4b3508b77 Clean up of serve_static_files 2025-05-15 14:10:15 +01:00
Joe Knapper
8799ebbaab csm info in webapp tab 2025-05-14 19:03:57 +01:00
Joe Knapper
04891f3721 Merge branch 'gui-logging' into 'v3'
Lazier regex for finding logs with square brackets

See merge request openflexure/openflexure-microscope-server!230
2025-05-14 17:16:22 +00:00
jaknapper
a1ef332e31 Set regexp equal to new format 2025-05-14 16:36:16 +01:00
Joe Knapper
4f8e508dd5 Apply 1 suggestion(s) to 1 file(s)
Co-authored-by: Julian Stirling <julian@julianstirling.co.uk>
2025-05-14 15:12:17 +00:00
jaknapper
19d72bef1c Error handling in _delete_scan(), which is now handled in GUI main.js 2025-05-14 16:11:02 +01:00
Julian Stirling
457d68b63c Merge branch 'use-numpy2' into 'v3'
Use NumPy v2 and new wheel for opencv

See merge request openflexure/openflexure-microscope-server!258
2025-05-14 12:37:06 +00:00
Joe Knapper
1468a90c60 Merge branch 'scan_tab' into 'v3'
Scan tab updates

See merge request openflexure/openflexure-microscope-server!260
2025-05-14 11:53:19 +00:00
jaknapper
99e52bcb2f Formatting and fixing wrong variable in loop 2025-05-14 12:23:01 +01:00
Joe Knapper
251b0ca770 Apply 1 suggestion(s) to 1 file(s)
Co-authored-by: Julian Stirling <julian@julianstirling.co.uk>
2025-05-14 10:26:37 +00:00
jaknapper
747bc3d79a Narrower scan tabs 2025-05-14 11:17:44 +01:00
jaknapper
a5d85a7d9e Layout improvements and stitch info in scan tab 2025-05-13 17:08:43 +01:00
jaknapper
3eea4bbaf6 Log each line individually to ensure line breaks 2025-05-13 17:08:09 +01:00
jaknapper
e1110bfe5d Removed border from logo svg 2025-05-13 17:07:51 +01:00
Joe Knapper
1c0220309c Merge branch 'update-data' into 'v3'
Update scan data JSON at end of scan

Closes #365

See merge request openflexure/openflexure-microscope-server!259
2025-05-13 14:52:47 +00:00
jaknapper
69260d1973 stitch available property, allowing GUI to only stitch when needed 2025-05-13 15:51:11 +01:00
jaknapper
a77c0f6f9d Updated wrong path to file 2025-05-13 15:28:16 +01:00
Joe Knapper
b5893bc29c Apply 1 suggestion(s) to 1 file(s)
Co-authored-by: Julian Stirling <julian@julianstirling.co.uk>
2025-05-13 12:34:50 +00:00
jaknapper
56edddd195 Data filename as global 2025-05-13 13:03:34 +01:00
jaknapper
1952e05284 Scan result in data json 2025-05-13 13:00:04 +01:00
jaknapper
9734bba23b Inputs renamed to data where appropriate 2025-05-13 12:45:55 +01:00