Commit graph

807 commits

Author SHA1 Message Date
Richard Bowman
f2768c9cad sorted docs and comments 2020-03-27 16:11:47 +00:00
Richard Bowman
6e94722ff4 removed spurious matplotlib dependency 2020-03-27 16:11:28 +00:00
Richard Bowman
1426848283 Nicely handle errors loading default extensions 2020-03-27 16:11:10 +00:00
Richard Bowman
f338b3b869 Turned debug mode back off 2020-03-27 16:10:49 +00:00
Joel Collins
9bddca6aaa Removed excessive debug logging 2020-03-27 15:07:44 +00:00
Joel Collins
43c8fea37f Use LabThings ClientEvent 2020-03-27 15:07:11 +00:00
Joel Collins
9e4934c054 Merge branch 'master' of https://gitlab.com/openflexure/openflexure-microscope-server 2020-03-27 14:17:57 +00:00
Joel Collins
b9fb94d19d Added debug output and stage lock on fast autofocus 2020-03-27 14:17:11 +00:00
Richard Bowman
2847fa9ab5 Merge branch 'master-versionbump' into stage-calibration 2020-03-26 16:19:19 +00:00
Richard Bowman
1211b346e7 Merge remote-tracking branch 'origin/master' into flatten_lst_route 2020-03-26 14:50:06 +00:00
Joel Collins
cd3aabacac Fix #131 2020-03-26 14:45:01 +00:00
Richard Bowman
0c84053834 Merge branch 'master' into flatten_lst_route 2020-03-26 13:26:23 +00:00
Joel Collins
0cc5919100 Added web component example source 2020-03-26 12:02:58 +00:00
Joel Collins
6476778673 Merge remote-tracking branch 'origin/master' into v2.1.0-dev 2020-03-25 17:00:55 +00:00
Richard Bowman
8a2a2abbec Merge branch 'v2.1.0-dev' into stage-calibration 2020-03-25 16:36:41 +00:00
Richard Bowman
e6ad52f107 Added an option to reset LST to None
This doesn't seem to work until you restart - probably an issue in my
picamera fork.
2020-03-24 17:42:49 +00:00
Richard Bowman
b9bb7d5dca Added a route to flatten the lens shading table
NB this is NOT the same as reverting to no lens shading table, as
there's a certain amount of auto-stuff that happens in that case.
2020-03-24 17:24:03 +00:00
Joel Collins
32ddcd5d13 Added sleeps to check for blank capture fix 2020-03-24 16:34:53 +00:00
Joel Collins
10fa93d11c Iterated to 2.0.0 2020-03-24 10:22:49 +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
Richard Bowman
5d5cc7a72a Added persistent settings and moves 2020-03-12 17:51:24 +00:00
Richard Bowman
d915625113 Added a kludgy extensions settings dictionary. 2020-03-12 16:43:18 +00:00
Richard Bowman
e452d623ca First working camera stage mapping calibration 2020-03-12 16:03:11 +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
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
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
0182f18e33 Reverted config initialisation behaviour 2020-02-19 10:41:31 +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