Commit graph

2240 commits

Author SHA1 Message Date
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
fa9a311c1a Merge branch '2.9-dev' of https://gitlab.com/openflexure/openflexure-microscope-server into 2.9-dev 2020-12-04 13:39:36 +00:00
Joel Collins
c6e7dcc3b0 Merge branch '2.9-dev-numpy-types' into '2.9-dev'
2.9 dev numpy types

See merge request openflexure/openflexure-microscope-server!102
2020-12-04 13:35:11 +00:00
Joel Collins
63b633ba44 2.9 dev numpy types 2020-12-04 13:35:11 +00:00
Joel Collins
a844efc8c8 Tweaked deprecation warnings 2020-12-01 17:39:53 +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
249e3014cb Updated to LabThings 1.2.1 2020-12-01 15:06:25 +00:00
Joel Collins
37f92b6cce Linting fixes 2020-11-30 17:17:14 +00:00
Joel Collins
8b20975cb9 Formatting 2020-11-30 17:11:37 +00:00
Joel Collins
b8354d3e8e Added type information to LABTHINGS_EXTENSIONS 2020-11-30 17:11:30 +00:00
Joel Collins
e433a897a4 Only use CompositeLock for microscope lock 2020-11-30 17:10:32 +00:00
Joel Collins
bc3927759f Handle missing endpoints 2020-11-30 17:10:00 +00:00
Joel Collins
d28848412c Fixed get_locations method reference 2020-11-30 16:59:56 +00:00
Joel Collins
d9d58d03dd Upgraded to LabThings 1.2.0 2020-11-30 16:58:12 +00:00
Joel Collins
18a0eedd5e Fixed tile method reference 2020-11-30 16:57:54 +00:00
Joel Collins
f849afd2c2 Clarified LABTHINGS_EXTENSIONS in docs 2020-11-30 16:45:43 +00:00
Joel Collins
8d0759e9e0 Updated default extensions to subclass structure 2020-11-30 16:41:39 +00:00
Joel Collins
bacc111a87 Updated documentation to subclass-based extensions 2020-11-30 16:23:28 +00:00
Joel Collins
7a849c725a Test on new LabThings branch 2020-11-30 16:23:02 +00:00
Joel Collins
5091ee8983 Updated to LabThings 1.1.6 2020-11-30 13:52:41 +00:00
Joel Collins
9be4b32bf8 Merge branch 'typing' into 'master'
Static type analysis

See merge request openflexure/openflexure-microscope-server!99
2020-11-30 13:36:45 +00:00
Joel Collins
7866ec0f47 Static type analysis 2020-11-30 13:36:45 +00:00
Joel Collins
3aebb8bead Merge branch 'pylint-fixes' into 'master'
Fixed unused imports

See merge request openflexure/openflexure-microscope-server!98
2020-11-25 15:33:10 +00:00
Joel Collins
b2192b2190 Fixed unused imports 2020-11-25 15:32:08 +00:00
Joel Collins
51a0813d22 Merge branch 'pytest' into 'master'
Added basic unit tests of non-integrated functions

See merge request openflexure/openflexure-microscope-server!97
2020-11-25 15:26:46 +00:00
Joel Collins
f1060d9e6d Merge branch 'master' into 'pytest'
# Conflicts:
#   poetry.lock
2020-11-25 15:26:20 +00:00
Joel Collins
8bdd3f2297 Merge branch 'no-pynpm' into 'master'
Removed unused pynpm package

See merge request openflexure/openflexure-microscope-server!96
2020-11-25 15:25:44 +00:00
Joel Collins
5137d1b9dc Added basic unit tests of non-integrated functions 2020-11-25 15:25:17 +00:00
Joel Collins
6819ded7ef Removed unused pynpm package 2020-11-24 17:49:50 +00:00
Joel Collins
f54684b460 Merge branch 'better-settings' into 'master'
Better settings

Closes #185 and #156

See merge request openflexure/openflexure-microscope-server!95
2020-11-24 12:39:41 +00:00
Joel Collins
4ba4403125 Added custom h4 formatting 2020-11-24 12:28:59 +00:00
Joel Collins
455b8681f7 Rearranged element layout 2020-11-24 12:28:45 +00:00
Joel Collins
a2f8158698 feat: Removed backlash settings 2020-11-24 12:26:31 +00:00
Joel Collins
c0fcd22cc3 feat: Added backlash and settle time settings 2020-11-24 12:26:14 +00:00
Joel Collins
0f7cecb545 feat: Added stream and capture quality settings 2020-11-24 12:25:57 +00:00
Joel Collins
e17366d976 fix: Fixed IHI tab icon duplication bug 2020-11-24 12:25:30 +00:00
Joel Collins
82a19ab29b Merge branch 'changelog-generator' into 'master'
Added changelog generator

See merge request openflexure/openflexure-microscope-server!94
2020-11-24 10:40:56 +00:00
Joel Collins
de6dbe4aa6 Added changelog generator 2020-11-24 10:40:56 +00:00
Joel Collins
755ee6629f Reduced initial changelog size 2020-11-24 10:32:15 +00:00
Joel Collins
f5acb25508 Added changelog generator 2020-11-24 10:28:31 +00:00
Joel Collins
ac446dcd42 Merge branch 'navigation-invert-config' into 'master'
Navigation invert config

See merge request openflexure/openflexure-microscope-server!93
2020-11-23 17:44:09 +00:00
Joel Collins
3e783c5e7c Common watch format 2020-11-23 17:32:09 +00:00
Joel Collins
d49b34ef6c Added options to invert navigation steps 2020-11-23 17:32:00 +00:00