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

2612 commits

This branch
This branch
All branches
Author SHA1 Message Date
Richard Bowman
146fccfa80 comment out problematic fetch 2023-12-01 02:43:31 +00:00
Richard Bowman
0cd8ecd2d5 Add error checking to mixin thing functions 
Now we'll get an error if undefined URLs are about to be fetched.
The error will contain thing and affordance, for debugging.
 2023-12-01 02:43:17 +00:00
Richard Bowman
ee641f5cd2 Comment out 2 problematic tabs 2023-12-01 02:31:59 +00:00
Richard Bowman
f87594e7af Hide error from CSM if it's uncalibrated 
The error still appears in the console - should be fixed
eventually.
 2023-12-01 02:31:49 +00:00
Richard Bowman
a31c0aa835 Error handling for CSM calibration check 2023-12-01 02:24:14 +00:00
Richard Bowman
5d87a7582e Format fixes 2023-12-01 02:23:58 +00:00
Richard Bowman
59e0cf5905 Fix action URLs 2023-12-01 02:22:49 +00:00
Richard Bowman
65c881fea1 Make calibrateXYUri a computed property 
This makes it properly reactive again.
 2023-12-01 01:46:11 +00:00
Richard Bowman
f97dcb6abc More tidying up to use new thing property functions 2023-12-01 01:45:45 +00:00
Richard Bowman
89cf58e8c7 Prepend thing description base URL 2023-12-01 01:45:22 +00:00
Richard Bowman
623cb5e8cb Use central read/write property, fix length issue 
.length was failing if value was undefined - now worked around.
 2023-12-01 01:44:22 +00:00
Richard Bowman
ccf9b38c34 Use thingAvailable via computed prop 
Computed properties are needed to make things reactive.
 2023-12-01 01:28:08 +00:00
Richard Bowman
55305a67f4 Remove old print statement 2023-12-01 00:58:29 +00:00
Richard Bowman
471a89cc72 Update paneCapture with new-style thing access 2023-12-01 00:56:13 +00:00
Richard Bowman
ca6988ca99 Update statusPane with new-style thing access 2023-12-01 00:55:56 +00:00
Richard Bowman
9c3c2bb043 Update CSMSettings to use new-style access 
Also deleted a lot of old code (which wasn't running)
 2023-12-01 00:55:25 +00:00
Richard Bowman
ba76561065 Update calibration modal to use cached TDs and new URLs 2023-12-01 00:54:54 +00:00
Richard Bowman
c2ec060df9 Switch to using TDs in the store 2023-11-30 23:22:10 +00:00
Richard Bowman
8865d88e20 Remove unnecessary components 2023-11-30 23:22:00 +00:00
Richard Bowman
54df1faeeb Linter fixes 2023-11-30 23:21:45 +00:00
Richard Bowman
f1f6ed5f80 Provide centralised readproperty, writeproperty, and action URLs 2023-11-30 22:51:10 +00:00
Richard Bowman
6c48444126 Removed vestigial code from CSMSettings 2023-11-30 09:14:04 +00:00
Richard Bowman
b47ac8b828 Remove unused URL computed props 2023-11-30 00:20:26 +00:00
Richard Bowman
8de79ad7e8 Delete unused print statements 2023-11-30 00:20:10 +00:00
Richard Bowman
24bfb4c253 Remove vestigial stage settings 2023-11-30 00:02:53 +00:00
Richard Bowman
488493385f Combine the various property controls into one component 
propertyControl now handles several different property types,
based on the thing description. This reduces duplication and
should keep the code cleaner.

In the future this will become a part of a labthings-vue package,
I hope!
 2023-11-29 23:54:00 +00:00
Richard Bowman
595101248e Removed node-wot but kept centralised TD store 
I had intended to store a ConsumedThing for each Thing, in
a module in the store. Until that is possible (will require some
more attention to dependency management) I will just store
the TDs instead.

This commit includes a lot of the code I wrote for node-wot use,
but without any dependence on node-wot.
 2023-11-29 22:43:55 +00:00
Richard Bowman
45d2884159 Merge remote-tracking branch 'origin/v3' into v3-webapp 2023-11-15 22:00:37 +00:00
Richard Bowman
1d24701dfd Fix shutdown/restart buttons 2023-11-02 21:33:42 +00:00
Richard Bowman
27c74bff6e Add shutdown/restart actions 2023-11-02 21:18:59 +00:00
Richard Bowman
65f467af64 Fix "About" page 2023-11-02 21:17:31 +00:00
Richard Bowman
4e7fa44a73 Remove microscope settings 
microscope name should be defined in config, by a
separate program/service
 2023-11-02 20:34:42 +00:00
Richard Bowman
27b1f42935 Updated camera stage mapping settings 2023-11-02 20:32:15 +00:00
Richard Bowman
c5c02eb029 Linted 2023-11-02 20:30:54 +00:00
Richard Bowman
7bbc105fc6 Expose last calibration and thing_state 2023-11-02 20:29:22 +00:00
Richard Bowman
79752a2a4c Camera settings for labthings-picamera2 
I've updated URLs and tidied things a bit, so that we can
now adjust the key camera settings with the new camera
drivers.
 2023-11-02 16:54:22 +00:00
Richard Bowman
13229d9b99 Command to run the server interactively 
It's sometimes helpful to run the server as openflexure-ws,
there's now a command in the readme that matches (for
now) the service definition.
 2023-11-02 10:39:37 +00:00
Richard Bowman
92ba79ef7a Improved docstrings 2023-11-02 10:27:27 +00:00
Richard Bowman
6eefa4f25b Add image resolution to CSM metadata 
The camera stage mapper should now note the resolution
used when it was last calibrated - this is helpful for tiling,
because we may need to scale it if the images recorded are
a different resolution from the images used for calibration.

This addresses https://gitlab.com/openflexure/microscope-extensions/camera-stage-mapping/-/issues/11
 2023-11-02 10:05:54 +00:00
Richard Bowman
4caba58d6c Revert to Sangaboard, rather than proscan 2023-11-01 18:02:16 +00:00
Richard Bowman
796622b802 Relax scipy version 2023-10-31 22:28:47 +00:00
Richard Bowman
b9804cdc2d Serve static web app at / 2023-09-06 11:56:20 +01:00
Richard Bowman
da711a7d8c linter fixes 2023-09-04 22:08:27 +01:00
Richard Bowman
799dc7f522 WIP: update webapp to use new backend 
This is still very much WIP, but I now have fast
autofocus, stage moves, image streaming, and click-to-move.
 2023-09-04 22:00:56 +01:00
Richard Bowman
e82acf2941 Add thing_state metadata 2023-09-04 11:43:32 +01:00
Richard Bowman
63d7a6eb4d WIP: camera stage mapping 
This still has some bugs, mostly related to numpy and serialisation.
 2023-08-31 19:37:09 +01:00
Richard Bowman
6e04618051 Autofocus module! 
Currently only has fast_autofocus, and there
may be some work to do on timing, but it works :)

Getting timestamps from the camera rather than
time.time() would be ideal, but it would take some thought to tie that up with
the encoder.

I'm using a low-res stream, as it seems impossible to
turn the bitrate control of the MJPEG stream off,
at least within the picamera2 API.
 2023-08-30 21:34:06 +01:00
Richard Bowman
081654533f First images on labthings-fastapi 
We now have very basic camera and stage support.
 2023-08-29 17:02:16 +01:00
Richard Bowman
ac45423739 Merge branch 'sangaboard-v4' into 'master' 
Support latest sangaboard firmware

See merge request openflexure/openflexure-microscope-server!154
 2023-04-12 07:23:15 +00:00
Richard Bowman
7abdbdde4a Add full list of server prerequisites 
The server needs various packages installed on
the system. This list is lifted from the SD card
builder repository.
 2023-04-06 21:27:51 +01:00