Commit graph

186 commits

Author SHA1 Message Date
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
jaknapper
687ef8a00e Replace semi colon with double ampersand, which is platform agnostic AND 2025-06-30 17:57:16 +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
fda0a6e1ab Merge branch 'v3' into fast-stack, with conflict resolution but not fully
working yet
2025-06-26 11:50:24 +01:00
Julian Stirling
dd63d74651 Removing mjpeg bitrate setter from UI and Python as it wasn't implemented fully and isn't a setting that should need changing 2025-06-23 12:39:41 +01:00
jaknapper
1d4bb7363f Images to test control in GUI 2025-06-17 14:34:42 +01:00
Julian Stirling
cf80120572 Remove numerical input spinners for x,y,z settings in Firefox
Chrome/Safari/Edge etc are all set already by the
`.numeric-setting-line-input::-webkit-outer-spin-button`
and
`.numeric-setting-line-input::-webkit-inner-spin-button`

but firefox needs a different line set on the input itself see:
https://www.w3schools.com/howto/howto_css_hide_arrow_number.asp
2025-06-10 08:47:23 +01:00
Julian Stirling
7fdb5f37ba Apply 4 suggestion(s) to 3 file(s)
Co-authored-by: Beth Probert <beth_probert@outlook.com>
2025-06-09 12:08:25 +00:00
Julian Stirling
c79184a6d9 Use same version number for server and webapp, add CI check
- Check webapp and server have same version number
- Use `genversion` on build to create javascript file with version string
from pyproject.toml
- Expose the version number in the js interface
- Correct format of current of alpha version string because javascript complains

Closes #382
2025-06-09 12:13:15 +01:00
Julian Stirling
60b2fda385 Merge branch 'custom-at' into 'v3'
Custom `from_index()` function in webapp for backwards compatibility before javascrpt `at()`

Closes #396

See merge request openflexure/openflexure-microscope-server!280
2025-06-06 12:00:05 +00:00
Joe Knapper
efb3b12819 Replace .at() in action button with custom .from_index() 2025-06-06 12:10:31 +01:00
Julian Stirling
3c47f98727 Clarify webapp README section on dev server ports. 2025-06-06 10:16:12 +00:00
Julian Stirling
41c91ea712 Apply 2 suggestion(s) to 1 file(s)
Co-authored-by: William Wadsworth <w.j.wadsworth@bath.ac.uk>
2025-06-06 08:54:55 +00:00
Julian Stirling
e0d61f3b87 De-duplicate npm build instructions 2025-06-05 12:27:22 +01:00
jaknapper
3c15d0ef0b Custom at() function in webapp for backwards compatibility 2025-06-05 11:50:43 +01: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
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
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
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
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
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
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
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
jaknapper
8c7b800983 Update theme.less to prevent automatic changed colour of uk-alert-success 2025-05-16 15:18:33 +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
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
e1110bfe5d Removed border from logo svg 2025-05-13 17:07:51 +01:00
jaknapper
69260d1973 stitch available property, allowing GUI to only stitch when needed 2025-05-13 15:51:11 +01:00