rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
964 commits 1 branch 0 tags 24 MiB
Commit graph

964 commits

This branch
This branch
All branches
Author SHA1 Message Date
Richard Bowman
be85d07210 Attempt to start the stream if it's stopped. 2020-04-23 11:22:14 +01:00
Richard Bowman
5a4aae8ed1 Added helpful errors if the stream has stopped 2020-04-23 11:15:10 +01:00
Richard Bowman
161c17812e Removed vestigial global statement 
There was a global declaration for the modules
np and logging, probably left over from running
this code in the dodgy console plugin.  I've
removed it as it's ugly, dodgy, and no longer
needed.
 2020-04-23 11:10:36 +01:00
Richard Bowman
6213620031 Enable ipv6 
Setting the listen address to :: puts flask into ipv6 mode.
This makes it compatible with ipv6 and, thanks
to the system automatically translating ipv4
into ipv6, it is completely compatible with ipv4
as well.
 2020-04-23 10:42:49 +01:00
Joel Collins
bcd6f426cc Merge branch 'actions-aint-actions' into 'master' 
The "actions" endpoint shouldn't be tagged

See merge request openflexure/openflexure-microscope-server!52
 2020-04-23 08:42:48 +00:00
Richard Bowman
102264c4be The "actions" endpoint shouldn't be tagged 
The actions endpoint (responds only to GET, lists the actions)
is not itself an action.
The ``@tag("actions")`` causes LabThings to try to include
it as an action, which fails.
Removing the tag makes the server run again -
but maybe I've broken something else here?
 2020-04-23 08:09:21 +01:00
Joel Collins
3c2f4d1eec Merge branch 'stage-calibration' into 'master' 
Stage calibration

See merge request openflexure/openflexure-microscope-server!43
 2020-04-14 10:36:45 +00:00
Richard Bowman
70d4c7e950 Merge branch 'master' into stage-calibration 2020-04-10 15:16:25 +01:00
Joel Collins
4a62d9c7c0 Merge branch '2.0.X-hotfix-b' into 'master' 
Documentation fix

See merge request openflexure/openflexure-microscope-server!51
 2020-04-07 11:03:26 +00:00
Joel Collins
f292ff3e43 Revert "Added sleeps to check for blank capture fix" 
This reverts commit 32ddcd5d13
 2020-04-07 11:03:26 +00:00
Joel Collins
13d18b4101 Removed medscan extension (now in separate repo) 2020-04-01 11:39:09 +01:00
Joel Collins
a5d5b6cda2 Removed example component from default extensions 2020-04-01 10:31:50 +01:00
Joel Collins
c1205fff3e Added step progress to section titles 2020-04-01 10:26:21 +01:00
Joel Collins
19c4f02f8d Added basic wizard content 2020-04-01 10:25:20 +01:00
Joel Collins
26086aaea7 Started drafting medscan extension 2020-03-31 16:25:04 +01:00
Joel Collins
0c695a377c Fixed debug app for example custom element 2020-03-31 16:24:41 +01:00
Joel Collins
a9239ab898 Added debug serve command 2020-03-31 13:52:17 +01:00
Joel Collins
3e21cd4680 Merge branch 'hotfix-2.0.x' into 'master' 
Hotfix 2.0.1

See merge request openflexure/openflexure-microscope-server!49
 2020-03-31 10:11:06 +00:00
Joel Collins
6f4791ec57 Merge branch 'master' into 'hotfix-2.0.x' 
# Conflicts:
#   openflexure_microscope/api/app.py
#   poetry.lock
#   pyproject.toml
 2020-03-31 10:10:33 +00:00
Joel Collins
63e19916be Updated dependencies and version 2020-03-31 11:01:13 +01:00
Joel Collins
3836c70b2c Monkey patch all 2020-03-31 10:53:44 +01:00
Joel Collins
37dc7b055c Fixed missing microscope parameter for autofocus 2020-03-30 17:04:09 +01:00
Joel Collins
de5894964e Explicitally use gevent for camera stream thread 2020-03-27 16:40:06 +00:00
Joel Collins
78edb695bf Default to not debug mode 2020-03-27 16:39:40 +00:00
Joel Collins
093c3d0446 Merge branch 'flatten_lst_route' into 'master' 
Added a route to flatten the lens shading table

Closes openflexure-microscope-jsclient#62

See merge request openflexure/openflexure-microscope-server!45
 2020-03-27 16:32:03 +00:00
Joel Collins
afc5c68e38 Merge branch 'master-versionbump' into 'master' 
version bump

See merge request openflexure/openflexure-microscope-server!47
 2020-03-27 16:31:27 +00:00
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
Richard Bowman
2c9e443d5d moved to a working version of opencv 2020-03-27 16:10:35 +00:00
Richard Bowman
83bb06d58f moved to a working version of opencv 2020-03-27 16:10:14 +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
543a6ff9b3 version bump 2020-03-26 16:16:25 +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
Joel Collins
03969fdfb2 Updated to LabThings 0.3.0 2020-03-26 14:17:04 +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
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
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
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