Commit graph

3032 commits

Author SHA1 Message Date
Joe Knapper
97c114b77e Show scan folder instead of name 2024-02-21 15:47:42 +00:00
jaknapper
43cf7e837a Produce tiff as property 2024-02-21 14:42:52 +00:00
jaknapper
169df15fd1 More restricted range 2024-02-21 14:04:07 +00:00
Joe Knapper
6031280a19 Merge branch 'changes-into-saturation-fix' into verify-focus 2024-02-20 14:17:25 +00:00
Joe Knapper
eafeaca3ff Readd zip name 2024-02-20 12:22:06 +00:00
Joe Knapper
bba0ab1853 Revert "Readd zip name generation"
This reverts commit c3742565b6
2024-02-20 12:21:21 +00:00
Joe Knapper
c3742565b6 Readd zip name generation 2024-02-20 12:15:42 +00:00
Joe Knapper
2c8660e01f Capture metadata before image to ensure consistency 2024-02-20 12:11:04 +00:00
jaknapper
e6eb4d419d Live logging (requires unbuffered program output from stitching) 2024-02-20 10:51:32 +00:00
Richard Bowman
41f03958c6 Save images with saturated pixels
If any pixels in the manually processed raw image end up
saturated (>255), this causes an error. I've now manually
clamped the values between 0 and 255 to fix this.

It would probably be a good idea to warn when this happens,
as it does mean we're losing data.
2024-02-15 17:34:29 +00:00
Richard Bowman
08e74ac020 Merge branch 'parallel_acquisition_and_moves' into 'v3'
Parallel acquisition and moves

See merge request openflexure/openflexure-microscope-server!174
2024-02-15 16:56:00 +00:00
Richard Bowman
82e2a250fc Include colour correction matrix and gamma in saved images
I've replicated more of the camera pipeline in the images
saved during scans - in particular, I've added the colour
correction matrix (increases saturation) and the contrast
agorithm (implements gamma correction).

This slows down saving to ~0.5-2 seconds, but that's still less time than it takes to move.
2024-02-15 16:38:15 +00:00
jaknapper
aed5a22983 Autofocus verify based on sharpness range, removed repetitive logging 2024-02-15 11:02:44 +00:00
Richard Bowman
a16c54d2db Update raw image processing in scan
This matches recent commits in labthings-picamera2
2024-02-14 18:03:13 +00:00
Joe Knapper
f1c315783c Test the success of refocusing 2024-02-13 15:24:42 +00:00
Joe Knapper
f2d85cb891 sleep before capturing 2024-02-09 19:06:58 +00:00
Joe Knapper
61d7712c27 tiff as an option 2024-02-09 19:05:20 +00:00
Joe Knapper
6aa712e515 Rescaling stitch preview to avoid scrolling in y 2024-02-09 16:08:21 +00:00
Richard Bowman
a61ffbf75a WIP: use code from labthings-picamera2 for EXIF writing
I've now switched to using piexif to write the EXIF tag, which
is slower - but still does not seem to work in openflexure-
stitching.
2024-02-05 17:14:56 +00:00
Richard Bowman
bc8db396bf Acquire raw images rather than processed ones
I've swapped `capture_jpeg` for `capture_array`. This will acquire a raw image and process it manually. Currently I've included LST correction, colour balance, but **not** the colour unmixing matrix. In the future we could add this to implement proper correction for saturation.

Currently EXIF data does not seem to be working properly.
2024-02-01 21:55:15 +00:00
Richard Bowman
24a1d9d020 WIP: try just waiting 0.5s rather than using an Event 2024-02-01 17:37:44 +00:00
Richard Bowman
4a18ef729a Parallelise capture of images and the next move 2024-02-01 17:36:05 +00:00
Richard Bowman
6e4e79f2d2 Factor out moving to the next scan point into a method 2024-02-01 16:49:18 +00:00
Richard Bowman
f60e6f2a0b Merge branch 'autofocus_efficiency' into 'v3'
Autofocus efficiency

See merge request openflexure/openflexure-microscope-server!173
2024-02-01 16:17:53 +00:00
jaknapper
db51cd8067 Make overlap value consistent 2024-02-01 15:31:14 +00:00
jaknapper
e6e809cea4 Zip files as we scan, saving the regenerated ones to the end
Removed maximum scan size of 750 images

Save json of scan inputs and use it for future stitching (ensures consistent parameters)

Moved looping autofocus to autofocus thing from recentering thing

Rewrote looping autofocus to skip unneeded moves, as if peak is out of range, no need to nicely focus
2024-01-30 18:46:34 +00:00
jaknapper
a0b98a1adc Fixed autofocus to not combine logs 2024-01-29 19:56:24 +00:00
Joe Knapper
528406137f Start autofocus from base of range for speed 2024-01-29 18:10:11 +00:00
Joe Knapper
53eb51e964 Improved default scan values 2024-01-23 15:22:30 +00:00
Joe Knapper
81d6514eb0 Always show scan name during scan 2024-01-23 11:42:03 +00:00
Richard Bowman
f44fb02006 Merge branch 'rwanda-feedback' into 'v3'
Hide background detect settings in an accordion

See merge request openflexure/openflexure-microscope-server!172
2024-01-17 14:22:51 +00:00
Richard Bowman
6a47835ea1 Re-label check coverage button 2024-01-17 14:13:12 +00:00
Richard Bowman
1b39f9d5c0 Add a button to stitch scans 2024-01-17 13:46:29 +00:00
Richard Bowman
0b45a5dc76 Allow action URIs to be retrieved without errors if they are missing
thingActionUrl may now be told to return `undefined` insstead of throwing an error if the action is missing.
2024-01-17 13:43:22 +00:00
Richard Bowman
653e1a4159 Added a button to flash the LED 2024-01-17 13:36:26 +00:00
Richard Bowman
50cf8e6f78 Generate zip files before download
Previously, zip files were only downloaded if they already
existed. Now, they are created with  an action, then
downloaded from the result.

Chrome now insists on downloading the files as `output.zip`, I can't see why this has changed, but perhaps it's related
to the security warning. This seems to be specific to zip files.
2024-01-17 13:16:41 +00:00
Richard Bowman
b35db02f34 Improved error handling and zip download
I've swapped out various `logging.exception` calls for
`logging.error` with `exc_info` set to the exception.
My reading of the docs is that the two shoulld be equivalent,
but the former fails with an error related to
message formatting, as if there was an extra (or missing) '%'.

I've changed the format of the downloaded zip file, so that it
now puts the stitched images at the top level (if they exist).

I've also modified the time of the last stitched image so it
returns None if it doesn't exist - this avoids HTTP errors in
the client.
2024-01-17 13:14:43 +00:00
Richard Bowman
65ae6c1f76 Removed a couple of print statements 2024-01-17 12:25:17 +00:00
Richard Bowman
f627d6e2f2 Always generate the preview stitch
The preview stitch is useful even if stitch-as-you-go is not
desired. I've enabled it all the time, not just when the box
is ticked.
2024-01-17 11:59:30 +00:00
Richard Bowman
674704b0d6 Display the microscope's hostname in the interface 2024-01-17 11:55:03 +00:00
Richard Bowman
36a7ec3d2e Expose hostname in settings manager
I've added a `hostname` property to the settings manager.
2024-01-17 11:53:08 +00:00
Richard Bowman
6e18a91d1f Hide background detect settings in an accordion
Feedback from clinicians is that this tab was too busy. This commit hides all but the two essential buttons.
2024-01-17 11:28:36 +00:00
Richard Bowman
011dc2191c Add a control to set whether scans are automatically stitched. 2024-01-15 21:36:15 +00:00
Richard Bowman
9ac0a11ce1 Add a property to enable/disable auto-stitching 2024-01-15 21:35:27 +00:00
Richard Bowman
06bc5f65cb Merge branch 'save_thing_settings_on_demand' into 'v3'
Make it possible to manually save all settings to disk

See merge request openflexure/openflexure-microscope-server!171
2024-01-15 21:20:33 +00:00
Richard Bowman
7d63c9da44 Add a button to save settings to disk 2024-01-15 21:19:03 +00:00
Richard Bowman
b9f7e6f1e3 Make it possible to manually save all settings to disk
There's now an action that will save all settings to disk.
This copies code from `labthings_fastapi.thing_server` so
may want to be deduplicated in the fullness of time.
2024-01-15 21:17:43 +00:00
Richard Bowman
dd0a70c2b6 Merge branch 'scan_name' into 'v3'
custom scan name from gui

See merge request openflexure/openflexure-microscope-server!170
2024-01-15 20:44:49 +00:00
Richard Bowman
e7a3003c47 Add a closing ` to the logging statement
This was mistakenly not added to the previous commit.
2024-01-15 20:42:54 +00:00
Richard Bowman
dca2d1fabb Improve scan naming logic and type hints
Removed an unnecessary `Optional` and removed the `scan_` prefix from scans that have a non-empty name.

I also added a closing ` to a logging statement.
2024-01-15 20:27:35 +00:00