Commit graph

4560 commits

Author SHA1 Message Date
Joe Knapper
31210be9ac Merge branch 'objective-sim' into 'v3'
Scale blur in simulator based on objective

Closes #745

See merge request openflexure/openflexure-microscope-server!567
2026-05-13 08:02:44 +00:00
Joe Knapper
d358d89334 Merge branch 'log-endpoints' into 'v3'
Update endpoints for logs

Closes #774

See merge request openflexure/openflexure-microscope-server!585
2026-05-12 16:29:48 +00:00
jaknapper
3420138e85 Mock updated api route 2026-05-12 16:11:03 +01:00
jaknapper
ec83556da7 Convert server prefix to str for Mock tests 2026-05-12 15:42:50 +01:00
Julian Stirling
fa2c4141f6 Merge branch 'bug-template' into 'v3'
More details in bug template

See merge request openflexure/openflexure-microscope-server!584
2026-05-12 13:37:14 +00:00
jaknapper
645a6dd136 Update endpoints for logs 2026-05-12 14:23:33 +01:00
Joe Knapper
d233715734 More details in bug template 2026-05-11 19:50:32 +01:00
Julian Stirling
92619e2131 Merge branch 'calibration_thing' into 'v3'
Calibrate settling times after moves

See merge request openflexure/openflexure-microscope-server!207
2026-05-11 12:32:30 +00:00
Julian Stirling
a2965e588d Merge branch 'v3-labthings-api-prefix' into 'v3'
Add an API prefix

See merge request openflexure/openflexure-microscope-server!562
2026-05-11 11:51:29 +00:00
jaknapper
cc6866b2e5 Add tests for measure settling time 2026-05-11 12:49:52 +01:00
jaknapper
c171e5bdde Remove hold from sharpness monitor 2026-05-11 12:49:20 +01:00
jaknapper
ffa023dfa9 Correct data types in sharpness monitors 2026-05-11 11:04:55 +00:00
jaknapper
500e08555c Measure settling time action and hold in sharpness monitor 2026-05-11 11:04:55 +00:00
Julian Stirling
b6efb73cba Fix data directory save location and mount path 2026-05-11 11:07:38 +01:00
Julian Stirling
fa5aaaf254 Update dependencies to use new labthings rc 2026-05-11 11:07:38 +01:00
Richard Bowman
f91373e215 Update default URL for overriding the origin. 2026-05-11 11:07:38 +01:00
Richard Bowman
c37ed236c3 Depend on the relevant labthings branch
This will need to be fixed before merge
2026-05-11 11:07:38 +01:00
Richard Bowman
93a2e87dac Adjust default origin URL to use /api/v3 prefix
This won't be the only URL that needs fixing, but it should make most of the web app work.
2026-05-11 11:07:38 +01:00
Richard Bowman
9851485057 Update config and lifecycle test to use API prefix
This adds an API prefix to the three config files, and updates the hard-coded URLs in the lifecycle test to use the new API root.

The change doesn't affect the unit or integration test suites, as neither of these set an API prefix.

Most of the required updates are likely to be in the web app, which I've not yet touched.
2026-05-11 11:07:38 +01:00
Julian Stirling
acdc88e870 Merge branch 'build/style-lint-fix-purge' into 'v3'
ui_migration Clean STYLE, setup Lint, at NPM and CI

Closes #764

See merge request openflexure/openflexure-microscope-server!577
2026-05-11 09:02:41 +00:00
Antonio Anaya
3b95d9a669 Apply suggestions from code review of branch build/style-lint-fix-purge
Co-authored-by: Julian Stirling <julian@julianstirling.co.uk>
2026-05-10 23:24:21 +00:00
Antonio Anaya
5c73007ec2 chore(node) update package lock file 2026-05-09 03:31:39 -06:00
Antonio Anaya
b6d145daa8 ui_migration build(ci) remove csspurge at request on MR 2026-05-09 00:54:59 -06:00
Antonio Anaya
4a9693df31 Apply suggestions from code review of branch build/style-lint-fix-purge
Co-authored-by: Julian Stirling <julian@julianstirling.co.uk>
2026-05-09 00:54:59 -06:00
Antonio Anaya
caf2157c04 ui_migration build(ci) added package and ci commands for stylelint --max-warnings=0 and --fix 2026-05-09 00:54:59 -06:00
Antonio Anaya
c7a49ffe0e ui_migration builf(purge) set configurations to minimize UIKIT on purge, set rules to minimize on build and not in serve. 2026-05-09 00:54:59 -06:00
Antonio Anaya
ba5e5b10f5 ui_migration lint(STYLE) Drop duplicates related to deprecated webkit-animation prefixes https://developer.mozilla.org/en-US/docs/Web/CSS/Reference/At-rules/@media/-webkit-animation 2026-05-09 00:54:59 -06:00
Antonio Anaya
0724f727ea ui_migration lint(STYLE) Drop deprecated keyword break-word 2026-05-09 00:54:59 -06:00
Antonio Anaya
7e2518e40e ui_migration lint(STYLE) Use --fix to solve 110 problems 3 left 2026-05-09 00:54:59 -06:00
Antonio Anaya
a4b167b147 ui_migration bugfix(stylelint) Add configuration overrides to protect UIkit and VUE LESS and color parsing 2026-05-09 00:54:59 -06:00
Antonio Anaya
359558f012 ui_migration style(fix) Add less configuration for lint 2026-05-09 00:54:59 -06:00
Antonio Anaya
72345622e5 ui_migration lint(style) Add LINT and PURGE to CSS LESS all over WEBAPP 2026-05-09 00:53:05 -06:00
Joe Knapper
fb539e9e8e Merge branch 'refactor/optimise_chunking_build' into 'v3'
ui_migration refactor(build) reduce chuncking size

Closes #758

See merge request openflexure/openflexure-microscope-server!575
2026-05-07 09:55:31 +00:00
Antonio Anaya
b2d31f6172 ui_migration refactor(build) reduce chuncking size 2026-05-07 09:54:49 +00:00
Joe Knapper
906b8be82c Merge branch 'start-gallery-thing' into 'v3'
Start implementing GalleryThing

See merge request openflexure/openflexure-microscope-server!576
2026-05-07 09:51:47 +00:00
Julian Stirling
c7bb3e3c11 Improve some attribute/method names 2026-05-07 09:48:49 +01:00
Julian Stirling
aeb337f9d1 Merge branch 'choose_int_downsample' into 'v3'
Choose a correlation resize factor rounded to an int

See merge request openflexure/openflexure-microscope-server!541
2026-05-07 08:14:41 +00:00
Julian Stirling
1b69b19ec3 Apply suggestions from code review of branch start-gallery-thing
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
2026-05-07 08:04:41 +00:00
Julian Stirling
85299e5a88 update picamera coverage zip 2026-05-06 16:59:03 +01:00
Julian Stirling
a16d47ed61 ScanList gets scans from GalleryThing, no ongoing scans shown. 2026-05-06 16:01:09 +01:00
Julian Stirling
4583151345 Add runtime checkable protocol for checking gallery compatibility. 2026-05-06 14:42:44 +01:00
Julian Stirling
93d7d75b0d Create basic gallery class that finds Things that want to show data 2026-05-06 10:05:34 +01:00
Julian Stirling
964a907edc Merge branch 'refactor/migrate_vuex_to_pinia' into 'v3'
ui_migration Migrate VUEX to Pinia

Closes #731

See merge request openflexure/openflexure-microscope-server!553
2026-05-01 12:52:05 +00:00
Julian Stirling
ac5e6e33c0 Merge branch 'check_os' into 'v3'
Change shutdown command depending on OS

See merge request openflexure/openflexure-microscope-server!574
2026-05-01 09:19:13 +00:00
Antonio Anaya
a7771d29ff Second batch of review fixings. Apply suggestions from code review of branch refactor/migrate_vuex_to_pinia
Co-authored-by: Julian Stirling <julian@julianstirling.co.uk>
2026-04-30 17:56:16 -06:00
Antonio Anaya
67f253eecd Apply suggestions from code review of branch refactor/migrate_vuex_to_pinia
Co-authored-by: Julian Stirling <julian@julianstirling.co.uk>
2026-04-30 21:24:29 +00:00
Julian Stirling
cc681a666c Change shutdown command depending on OS versions 2026-04-30 14:48:35 +01:00
Julian Stirling
5b14f8d820 Add method for checking OS version. 2026-04-30 14:14:24 +01:00
Joe Knapper
62d1724db6 Merge branch 'pull-webapp-from-fork' into 'v3'
Add -p argument to pull_webapp for setting GitLab project ID

See merge request openflexure/openflexure-microscope-server!573
2026-04-30 11:26:39 +00:00
Julian Stirling
a8eea66d82 Add -p argument to pull_webapp for setting GitLab project ID 2026-04-30 11:32:31 +01:00