rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3087 commits 1 branch 0 tags 24 MiB
Commit graph

3087 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joe Knapper
9dac080566 Fixed merge conflict 2025-06-20 15:14:35 +00:00
Joe Knapper
b05e3bee63 added openflexure/ to .gitignore 2025-06-20 16:11:07 +01:00
Joe Knapper
b01032be99 Merge branch 'update-issue-templates' into 'v3' 
Update issue templates

See merge request openflexure/openflexure-microscope-server!295
 2025-06-17 16:23:43 +00:00
Julian Stirling
dd24a3863d Apply suggestions from code review of branch update-issue-templates 
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
 2025-06-17 15:58:45 +00:00
Julian Stirling
f7545c6d8d Update issue templates 2025-06-17 11:18:33 -04:00
Julian Stirling
67e8b19603 Merge branch 'remove-nav-spinners-firefox' into 'v3' 
Remove numerical input spinners for x,y,z settings in Firefox

See merge request openflexure/openflexure-microscope-server!288
 2025-06-16 12:15:42 +00:00
Julian Stirling
c43b7cb8b4 Merge branch 'more-checkers' into 'v3' 
Enable more lint checkers

See merge request openflexure/openflexure-microscope-server!290
 2025-06-12 11:56:29 +00:00
Julian Stirling
37bb9635ad Apply 2 suggestion(s) to 2 file(s) 
Co-authored-by: Beth Probert <beth_probert@outlook.com>
 2025-06-12 10:29:54 +00:00
Julian Stirling
3019e13c80 Add commented out code check to linters 2025-06-11 23:40:49 +01:00
Julian Stirling
86dad84a5a Merge branch 'correct-alpha-version-changelog' into 'v3' 
Correct version name in change beta1 -> alpha1

See merge request openflexure/openflexure-microscope-server!291
 2025-06-11 12:50:12 +00:00
Julian Stirling
fe26a299d5 Correct version name in change beta1 -> alpha1 2025-06-11 10:08:16 +00:00
Julian Stirling
04832892cc Chnge docstring tester from Doc to D as Doc has no effect 2025-06-10 16:07:49 +01:00
Julian Stirling
1c54d25212 Add ruff checking for unnecessary comprehensions 2025-06-10 16:07:49 +01:00
Julian Stirling
2050c2dc7c Add return checker, needed 4 fixes 2025-06-10 16:07:48 +01:00
Julian Stirling
3f0564f253 Turning on more lint checkers, warning for cameras that ignore resolution setting 2025-06-10 16:07:48 +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
6c6356bf38 Merge branch 'final-changes-for-v3.0.0-alpha1' into 'v3' 
Update depedencies and changelog prior to v3.0.0-alpha1 release

Closes #398

See merge request openflexure/openflexure-microscope-server!287
 2025-06-09 15:38:56 +00:00
Julian Stirling
e223405444 Tweak changelog and add MR list 
Co-authored-by: Beth Probert <beth_probert@outlook.com>
Co-authored-by: William Wadsworth <w.j.wadsworth@bath.ac.uk>
 2025-06-09 16:11:19 +01:00
Julian Stirling
0457978048 Update depedencies and changelog priort to v3.0.0-alpha1 release 
Closes #398
 2025-06-09 15:39:26 +01:00
Joe Knapper
ae2ec1864f Merge branch 'config-scan-dir' into 'v3' 
Add scan directory to json config

Closes #393

See merge request openflexure/openflexure-microscope-server!283
 2025-06-09 13:42:27 +00:00
Julian Stirling
80b6fd088d Merge branch 'reverse_csm_order' into 'v3' 
Swapped the order of CSM so y axis is completed first

See merge request openflexure/openflexure-microscope-server!285
 2025-06-09 13:39:06 +00:00
Chish36
7eed48ed26 Swapped the order of CSM so y axis is completed first 2025-06-09 13:39:06 +00:00
Julian Stirling
37960a4cc2 Merge branch 'Server-versioning' into 'v3' 
Use same version number for server and webapp, add CI check

Closes #382

See merge request openflexure/openflexure-microscope-server!286
 2025-06-09 12:32:41 +00: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
24b6eb74a1 Merge branch 'update-version-for-alpha1' into 'v3' 
Update labthings-api dep and also the version number for alpha release

See merge request openflexure/openflexure-microscope-server!284
 2025-06-06 13:38:19 +00:00
Julian Stirling
2aa7d0f6be Update labthings-api dep and also the version number for alpha release 2025-06-06 13:09:04 +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
Julian Stirling
3a1c3bb026 Ensure server and config vars always defined before fallback server is started 2025-06-06 12:42:21 +01:00
Julian Stirling
b45f5651ab Add scan directory to json config 2025-06-06 12:21:51 +01:00
Joe Knapper
efb3b12819 Replace .at() in action button with custom .from_index() 2025-06-06 12:10:31 +01:00
Joe Knapper
13c63f8481 Merge branch 'simulation-axes' into 'v3' 
Defocus and realign simulation axes

See merge request openflexure/openflexure-microscope-server!282
 2025-06-06 10:46:29 +00:00
Julian Stirling
ef246c1b03 Merge branch 'build-with-node-18' into 'v3' 
Change from building with node 15  to node 18

See merge request openflexure/openflexure-microscope-server!281
 2025-06-06 10:41:11 +00:00
Joe Knapper
08d1371569 Apply 1 suggestion(s) to 1 file(s) 
Co-authored-by: Julian Stirling <julian@julianstirling.co.uk>
 2025-06-06 10:25:34 +00: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
Joe Knapper
69db7b4041 Apply 2 suggestion(s) to 1 file(s) 
Co-authored-by: Julian Stirling <julian@julianstirling.co.uk>
 2025-06-05 17:09:37 +00:00
Joe Knapper
41f6c8879a RATIO as a global, better naming and splitting of generate_image() 2025-06-05 15:03:26 +01:00
Julian Stirling
e0d61f3b87 De-duplicate npm build instructions 2025-06-05 12:27:22 +01:00
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
Joe Knapper
2db895a1fc Defocus and realign simulation axes 2025-06-05 12:09:01 +01:00
jaknapper
3c15d0ef0b Custom at() function in webapp for backwards compatibility 2025-06-05 11:50:43 +01: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