Commit graph

2292 commits

Author SHA1 Message Date
Joel Collins
8e4d34205f Isort 2021-01-08 12:34:41 +00:00
Joel Collins
18b2dabbd2 Merge branch 'mypy-coverage' into 'master'
Mypy coverage report

See merge request openflexure/openflexure-microscope-server!110
2021-01-08 11:08:05 +00:00
Joel Collins
5f48be3807 Merge branch 'master' into 'mypy-coverage'
# Conflicts:
#   poetry.lock
2021-01-08 10:51:15 +00:00
Joel Collins
bb7d543ecd Actually removed pynpm and updated sphinx 2021-01-08 10:22:04 +00:00
Joel Collins
5232b36644 Test cobertura mypy coverage report 2021-01-08 10:05:31 +00:00
Joel Collins
180d73f9c4 Upgraded to LabThings ^1.2.2 2021-01-07 10:23:46 +00:00
Joel Collins
bd7833c20f Test app object initialises 2021-01-07 10:23:27 +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
8594414c60 Removed jtc CC 2020-12-15 12:08:40 +00:00
Joel Collins
3f3a0d0eee Removed jtc CC 2020-12-15 12:08:26 +00:00
Joel Collins
4a98602071 Merge branch '2.9-patch' into 'master'
2.9.3

Closes #194

See merge request openflexure/openflexure-microscope-server!109
2020-12-14 15:46:08 +00:00
Joel Collins
f330cc93ec v2.9.3 2020-12-14 15:05:14 +00:00
Joel Collins
0592d31b22 Fix #194 2020-12-14 15:00:37 +00:00
Joel Collins
f67bf01777 Updated isort command to use Poe 2020-12-09 16:11:20 +00:00
Joel Collins
18956bf230 Update README.md 2020-12-09 16:04:23 +00:00
Joel Collins
332fc90083 Added Key info 2020-12-09 15:51:02 +00:00
Joel Collins
06cc2880e7 Formatting 2020-12-09 15:34:58 +00:00
Joel Collins
a3598b433c Added Creating releases notes 2020-12-09 15:31:40 +00:00
Joel Collins
8d69132ae1 Merge branch '2.9.2-release' into 'master'
2.9.2 release

See merge request openflexure/openflexure-microscope-server!108
2020-12-09 12:14:40 +00:00
Joel Collins
5c62a341b6 Updated changelog 2020-12-09 12:01:28 +00:00
Joel Collins
e6c63e2eaf Merge branch 'better-bitrate-controls' into 'master'
Better stream bitrate controls

See merge request openflexure/openflexure-microscope-server!106
2020-12-09 11:55:38 +00:00
Joel Collins
72d33fff7d Patch version 2020-12-08 18:26:31 +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
6e1383d1c4 Merge branch 'bitrate-controls' into 'master'
Added stream bitrate controls

See merge request openflexure/openflexure-microscope-server!105
2020-12-07 17:23:51 +00:00
Joel Collins
47680fd23b v2.9.1 2020-12-07 17:11:02 +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
d6e6a48c3e Merge branch 'eslint-on-branches' into 'master'
Run eslint on branches

See merge request openflexure/openflexure-microscope-server!104
2020-12-07 14:45:45 +00:00
Joel Collins
d454255cb6 Run eslint on branches 2020-12-07 14:45:17 +00:00
Joel Collins
28cf692fca Merge branch '2.9-rc' into 'master'
v2.9.0

See merge request openflexure/openflexure-microscope-server!103
2020-12-07 14:43:35 +00:00
Joel Collins
6435188334 v2.9.0 2020-12-07 14:42:15 +00:00
Joel Collins
9cf0a9badf Merge branch '2.9-dev' into 'master'
v2.9.0

See merge request openflexure/openflexure-microscope-server!101
2020-12-07 14:01:02 +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
b6a0a6395e Bumped version number 2020-12-04 17:09:52 +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