Commit graph

1103 commits

Author SHA1 Message Date
Richard Bowman
b06dd187ec Fixed args in endpoints 2021-02-15 20:18:34 +00:00
Richard Bowman
069d27bf15 Lock access to picamera
The picamera object isn't thread safe; I have now wrapped all access
in context managers that acquire the BaseCamera.lock

I also added an endpoint to reset the LST without auto-gain.
2021-02-15 20:15:55 +00:00
Richard Bowman
a9709b14ea Added locking to recalibrate functions
When testing the UI I noticed that the different recalibrate routines
don't use locks properly, so they try to run
concurrently.

This commit isn't tested yet...
2021-02-15 19:21:27 +00:00
Richard Bowman
36284c10be UI Improvements
I've added buttons to perform the separate calibrations (gain, AWB)
under the full recalibrate link.
It would be really nice to have a modal dialog though.
2021-02-15 19:17:20 +00:00
Richard Bowman
2f6049610f Added controls for AWB gains,
I also increased the precision of the numbers, which makes the step
buttons annoyingly useless but allows floating point
values without validation errors.
2021-02-15 17:50:39 +00:00
Richard Bowman
0f1a400979 Fixed type hint 2021-02-15 17:04:44 +00:00
Richard Bowman
4c27d88b37 Fixed description and linted 2021-02-11 15:54:58 +00:00
Richard Bowman
5527c4eb7b Fix auto-exposure and AWB
The previous "auto calibrate" button for the camera relied on a
combination of the built-in autoexposure/AWB and
some JPEG-based tweaks to get the exposure settings right.
This often led to confusing results, e.g. oscillating between green and
 pink images.

 I have rewritten the auto-exposure code to adjust gain and shutter
 speed based on the raw image.  This seems to be
 very reliable, at the expense of being quite slow.  That's a price I'm
 happy to pay.

 I have replaced both the camera's auto white balance and my
 JPEG-based AWB hack with a single-shot AWB method that
 looks at the raw image.
2021-02-11 14:30:20 +00:00
Richard Bowman
2b3c0a9bac Make the origin override persistent
The dev tools pane now remembers the last address you entered in
"override origin" to save a few clicks  when doing local Vue development
2021-02-09 09:46:52 +00:00
Richard Bowman
a9ef605c33 Merge branch 'fix-tour-placement' into 'master'
Fix tour placement

Closes #199

See merge request openflexure/openflexure-microscope-server!114
2021-02-06 15:32:27 +00:00
Richard Bowman
afbb71607d Fix placement of tour messages for icons
The tour pop-ups were getting stuck in the tab icon container.
Explicitly specifying that they could overflow said container,
and setting them to show to the right, seems to have fixed this issue.
2021-02-06 15:32:27 +00:00
Richard Bowman
9c069ef372 Allow MissingStage to be explicitly selected
You can now set the stage type to "MissingStage" in
microscope_configuration.json to stop the server looking for the stage.
A warning is logged to make it obvious what's happening.
2021-02-04 20:31:20 +00:00
Joel Collins
5232b36644 Test cobertura mypy coverage report 2021-01-08 10:05:31 +00:00
Joel Collins
ef0f74838a Removed unused import 2021-01-07 10:09:43 +00:00
Joel Collins
e8560a1d5d Removed unused ERROR_SOURCES 2021-01-06 17:31:58 +00:00
Joel Collins
61554af270 Restructured camera rescue 2021-01-06 17:31:45 +00:00
Joel Collins
3501a5b624 Merge branch 'picamera-rescue' into 'master'
Picamerax error recovery

See merge request openflexure/openflexure-microscope-server!86
2021-01-05 17:11:03 +00:00
Joel Collins
f877c4f745 Added Spiral scan to standard options 2021-01-05 14:30:49 +00:00
Joel Collins
0592d31b22 Fix #194 2020-12-14 15:00:37 +00:00
Joel Collins
18956bf230 Update README.md 2020-12-09 16:04:23 +00:00
Joel Collins
68380385cb Watch for broken frames using JPEG end bytes, and log error 2020-12-08 18:07:05 +00:00
Joel Collins
d2488c566a Added more Advanced bitrate controls 2020-12-08 17:57:42 +00:00
Joel Collins
0626b13bfd Formatting 2020-12-07 17:08:47 +00:00
Joel Collins
42e0dfd39c Replaced MJPEG quality setting with MJPEG bitrate 2020-12-07 17:05:56 +00:00
Joel Collins
3e2f876627 Added mjpeg bitrate to settings 2020-12-07 16:49:00 +00:00
Joel Collins
9659c45bb4 Fixed SangaDeltaStage type annotations 2020-12-07 12:44:34 +00:00
Joel Collins
c75a7c5401 Lockfile update 2020-12-07 11:13:35 +00:00
Joel Collins
9d04842c56 Handle missing this.$refs.textboxKey ref 2020-12-07 11:12:07 +00:00
Joel Collins
599c31534d globalUpdateCaptures after scan 2020-12-07 10:37:04 +00:00
Joel Collins
58b2967f53 Fixed autofocus 'PiCameraStreamer' object has no attribute 'annotate_text' error 2020-12-07 10:12:30 +00:00
Joel Collins
311366c943 Added type hints to CSM extension 2020-12-04 17:05:40 +00:00
Joel Collins
920354537a Integrated CSMExtension 2020-12-04 16:05:39 +00:00
Joel Collins
7ba3f447e1 Added extra type hints 2020-12-04 15:23:03 +00:00
Joel Collins
1de6b2a0ab Fixed onScanError 2020-12-04 15:14:30 +00:00
Joel Collins
8eff136cc3 Reduced logging level of some mock camera notices 2020-12-04 15:09:45 +00:00
Joel Collins
4d1d0a15c4 Added log level filter 2020-12-04 15:08:47 +00:00
Joel Collins
08f653233b Fixed onError propagation 2020-12-04 15:08:39 +00:00
Joel Collins
213dec3e5c Fixed individual captures creating 'undefined' dataset 2020-12-04 14:24:00 +00:00
Joel Collins
3c3ecd7f0c Updated dependencies 2020-12-04 13:39:49 +00:00
Joel Collins
63b633ba44 2.9 dev numpy types 2020-12-04 13:35:11 +00:00
Kaspar Emanuel
805b9012dd Make linter happy 2020-12-02 10:57:07 +00:00
Kaspar Emanuel
cc73aec257 Detect picamera in use error 2020-12-02 10:46:23 +00:00
Kaspar Emanuel
cc1c5e77c3 Format check_picamera.py with black 2020-12-02 10:46:23 +00:00
Kaspar Emanuel
fbd3b349df Detect camera not enabled picamerax error 2020-12-02 10:46:21 +00:00
Joel Collins
f2a2d880f2 Stricter runtime type checks 2020-12-01 17:30:53 +00:00
Joel Collins
fd42e2e2b6 Fixed broken dataset rendering if key exists but is empty 2020-12-01 17:13:20 +00:00
Joel Collins
ac667c3e2a Fixed types in move_rel method 2020-12-01 17:10:47 +00:00
Joel Collins
bc9b80d11a Added start_worker and get_frame for compatibility 2020-12-01 17:10:25 +00:00
Joel Collins
37f92b6cce Linting fixes 2020-11-30 17:17:14 +00:00
Joel Collins
b8354d3e8e Added type information to LABTHINGS_EXTENSIONS 2020-11-30 17:11:30 +00:00