Commit graph

917 commits

Author SHA1 Message Date
Joel Collins
b9fb94d19d Added debug output and stage lock on fast autofocus 2020-03-27 14:17:11 +00:00
Joel Collins
03969fdfb2 Updated to LabThings 0.3.0 2020-03-26 14:17:04 +00:00
Joel Collins
0cc5919100 Added web component example source 2020-03-26 12:02:58 +00:00
Joel Collins
0ff7e670ca Merge branch 'v2.1.0-dev' into 'master'
V2.1.0 dev

See merge request openflexure/openflexure-microscope-server!46
2020-03-26 11:31:24 +00:00
Joel Collins
6476778673 Merge remote-tracking branch 'origin/master' into v2.1.0-dev 2020-03-25 17:00:55 +00:00
Joel Collins
32ddcd5d13 Added sleeps to check for blank capture fix 2020-03-24 16:34:53 +00:00
Joel Collins
f5c04971d1 Merge branch 'rwb27-plugin-comments' into 'master'
fixed a couple of trivial typos

See merge request openflexure/openflexure-microscope-server!37
2020-03-24 11:19:06 +00:00
Joel Collins
7c59245753 Merge branch 'master' into 'rwb27-plugin-comments'
# Conflicts:
#   docs/source/extensions/structure.rst
2020-03-24 11:17:11 +00:00
Joel Collins
10fa93d11c Iterated to 2.0.0 2020-03-24 10:22:49 +00:00
Joel Collins
4626fa0565 Added docs for subclassing and lifecycle hooks 2020-03-24 10:22:39 +00:00
Joel Collins
7304d6534e Added LabThings type to OFM app 2020-03-23 17:02:29 +00:00
Joel Collins
85b43c307d Added example Web Component extension 2020-03-18 17:52:28 +00:00
Joel Collins
6b14ea8395 Moved viewPanel into top-level of extension GUI 2020-03-18 17:51:55 +00:00
Joel Collins
093e5a0a7a Fixed broken delete argument (capture_id instead of id) 2020-03-17 17:15:52 +00:00
Joel Collins
5dfc27ed03 Fixed broken delete argument (capture_id instead of id) 2020-03-17 17:14:29 +00:00
Joel Collins
a2914d8cf4 Merge remote-tracking branch 'origin/master' into v2.1.0-dev 2020-03-17 15:03:55 +00:00
Joel Collins
b7c3f7b9e1 Added viewPanel GUI property 2020-03-17 14:23:52 +00:00
Joel Collins
697fa87566 Removed debug print 2020-03-17 14:20:07 +00:00
Joel Collins
c657014388 Run gevent monkeypatch 2020-03-15 17:06:26 +00:00
Joel Collins
2bc02b3844 Sync frames using gevent events 2020-03-15 17:06:05 +00:00
Joel Collins
d098af8858 Use gevent sleep in mock camera 2020-03-15 17:04:40 +00:00
Joel Collins
414be0405e Added a note about concurrency 2020-03-15 16:30:34 +00:00
Joel Collins
6092e8ab5d Rearranged for clarity 2020-03-15 16:30:19 +00:00
Joel Collins
1a27a8e4f3 Pin LabThings to 0.2.0 PyPI release 2020-03-13 15:56:38 +00:00
Joel Collins
bf4cb24cb3 Fall back to mock stage if Sangastage is missing 2020-03-11 10:48:55 +00:00
Joel Collins
465e52d705 Merge branch 'master' of https://gitlab.com/openflexure/openflexure-microscope-server 2020-03-11 10:24:43 +00:00
Joel Collins
43d13cb7cd Fixed rule cleaning 2020-03-11 10:24:37 +00:00
Joel Collins
c3eefa5c1d First test of LabThings Gevent-based server 2020-03-10 17:38:44 +00:00
Joel Collins
7182e9d5df Updated labthings 2020-03-10 16:02:04 +00:00
Joel Collins
9f4d87dfc4 Updated lockfile 2020-03-10 15:52:24 +00:00
Joel Collins
4dd01bfcd2 Always log to log file 2020-03-10 14:21:56 +00:00
Joel Collins
4edf07be15 Merge branch 'master' of https://gitlab.com/openflexure/openflexure-microscope-server 2020-03-04 22:06:11 +00:00
Joel Collins
ead4e108cc Updated eV Lite 2020-03-04 22:06:03 +00:00
Joel Collins
5c27ae5a45 Fixed extension rule matching 2020-03-04 10:42:29 +00:00
Joel Collins
2b33c7fd86 Iterated to beta 6 2020-03-03 16:51:25 +00:00
Joel Collins
9842de8859 Started basic rescue script 2020-03-03 16:13:21 +00:00
Joel Collins
843d282dfc Added GUI title to autostorage 2020-03-03 09:56:04 +00:00
Joel Collins
a1531e9b14 Fixed capture key types 2020-03-01 18:04:33 +00:00
Joel Collins
60c6ae72f8 Handle captures as an OrderedDict. Fixes file deletion 2020-03-01 17:57:30 +00:00
Joel Collins
7235445cf2 Upgraded dependencies and picamera fork 2020-03-01 17:38:31 +00:00
Joel Collins
0182f18e33 Reverted config initialisation behaviour 2020-02-19 10:41:31 +00:00
Joel Collins
5264b04be4 Updated and iterated to beta 5 2020-02-18 17:25:39 +00:00
Joel Collins
13f3ee4e2c Merge branch 'autostorage-test' into 'master'
Autostorage extension

See merge request openflexure/openflexure-microscope-server!41
2020-02-18 17:19:39 +00:00
Joel Collins
ff90e998c7 Better handle reloading captures on path change 2020-02-18 16:55:58 +00:00
Joel Collins
f0d6afec88 Removed some debug statements 2020-02-18 16:27:02 +00:00
Joel Collins
bf00696e14 Added basic eV GUI 2020-02-18 16:16:23 +00:00
Joel Collins
0595d3c620 Let camera object handle its own library rebuild 2020-02-18 16:16:06 +00:00
Joel Collins
d39f897531 Fixed GUI rule matching 2020-02-18 15:57:28 +00:00
Joel Collins
4521837c45 Property to read and write capture storage path (by location key) 2020-02-18 15:14:30 +00:00
Joel Collins
201da43fb7 Generate dictionary of available storage locations 2020-02-18 13:41:42 +00:00