Joel Collins
744ded1d9e
Added support for Iframe-based extension interfaces
2020-05-12 14:28:50 +01:00
Joel Collins
d79580d44d
Updated dependencies
2020-05-12 13:58:27 +01:00
Joel Collins
eaf4cf09f5
Updated to new Action tasks
2020-05-12 11:29:53 +01:00
Joel Collins
28e555ad9b
Added explicit endpoints
2020-05-10 16:35:16 +01:00
Joel Collins
93d29fbc8d
Added full logger
2020-05-10 16:35:08 +01:00
Joel Collins
d884680daa
Merge branch 'capture-manager' into 'master'
...
Capture manager
See merge request openflexure/openflexure-microscope-server!57
2020-05-04 09:30:51 +00:00
Joel Collins
6d9314e0c9
Merge branch 'master' into 'capture-manager'
...
# Conflicts:
# poetry.lock
# pyproject.toml
2020-05-04 09:30:03 +00:00
Joel Collins
ef6f428a84
Updated dependencies
2020-04-30 17:46:59 +01:00
Joel Collins
ba280c6284
Added stream view tab
2020-04-30 15:01:16 +01:00
Richard Bowman
484734df95
Revert "add FFT tracking and "leapfrog" support"
...
This reverts commit e46e06d840
2020-04-29 12:07:43 +01:00
Richard Bowman
e46e06d840
add FFT tracking and "leapfrog" support
2020-04-29 12:00:13 +01:00
Joel Collins
a34214b9fb
Fixed broken references to capture list
2020-04-28 14:47:22 +01:00
Joel Collins
45ee112e6f
Fixed broken references
2020-04-28 14:40:09 +01:00
Joel Collins
caf553db7a
Moved capture management into separate object
2020-04-28 14:32:56 +01:00
Joel Collins
1a6088a816
Code formatting
2020-04-28 13:42:26 +01:00
Joel Collins
9ff24e8e37
Added updated opencv-python-headless for Py38 installations
2020-04-28 13:36:53 +01:00
Joel Collins
d4dbafcb52
Explicit __all__ in devel submodule
2020-04-28 13:20:48 +01:00
Joel Collins
9646058c37
Code format
2020-04-28 13:20:38 +01:00
Joel Collins
ed8057ce04
Upgrade to labthings 0.5.2
2020-04-27 13:10:34 +01:00
Joel Collins
bead058b6d
Fixed button size
2020-04-24 18:00:20 +01:00
Joel Collins
43e35501e1
Fixed updated dependencies
2020-04-24 17:48:06 +01:00
Joel Collins
55fe7ddd77
Merge branch 'csm-download-button' into 'master'
...
Added CSM data download button
See merge request openflexure/openflexure-microscope-jsclient!50
2020-04-24 16:47:51 +00:00
Joel Collins
99ef24fb95
Remove unused (and old) import
2020-04-24 17:31:48 +01:00
Joel Collins
ef5b3393f9
Merge branch 'csm-calibration-file' into 'master'
...
Added calibration data download view
See merge request openflexure/openflexure-microscope-server!56
2020-04-24 16:30:46 +00:00
Joel Collins
095e09698d
Fixed callback order for checking if data exists
2020-04-24 17:29:34 +01:00
Joel Collins
2692d8e554
Merge branch 'improved-settings-layout' into 'master'
...
Improved settings layout
See merge request openflexure/openflexure-microscope-jsclient!49
2020-04-24 15:44:47 +00:00
Joel Collins
9822965335
Added CSM data download button
2020-04-24 16:43:27 +01:00
Joel Collins
a1f3dd1624
Added calibration data download view
2020-04-24 16:42:35 +01:00
Joel Collins
6fcd8caf91
Merge branch 'autofocus-error-messages' into 'master'
...
Autofocus error messages
See merge request openflexure/openflexure-microscope-server!54
2020-04-24 15:14:37 +00:00
Joel Collins
216bf70dde
Merge branch 'json-encoder-fix' into 'master'
...
Json encoder fix
See merge request openflexure/openflexure-microscope-server!55
2020-04-24 15:14:25 +00:00
Joel Collins
cda5cdbb44
Switched away from using JSONify
2020-04-24 16:05:01 +01:00
Joel Collins
4fffa1fcba
Update deps
2020-04-24 16:04:46 +01:00
Joel Collins
07c4399bbf
Further layout improvements
2020-04-24 11:19:46 +01:00
Joel Collins
a992f88aea
Fixed padding on bigger buttons
2020-04-24 11:19:38 +01:00
Joel Collins
20d477248a
Update deps
2020-04-24 10:50:05 +01:00
Joel Collins
d940722851
Merge branch 'improved-settings-layout' into 'master'
...
Improved settings layout
See merge request openflexure/openflexure-microscope-jsclient!48
2020-04-23 16:58:20 +00:00
Joel Collins
6fa77e04e3
Updated settings to a navbar layout
2020-04-23 17:30:04 +01:00
Joel Collins
b871be48a4
Updated dev deps
2020-04-23 17:29:36 +01:00
Joel Collins
abd291f1e0
Base OFM JSON encoder on LabThings encoder
2020-04-23 14:25:19 +01:00
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
Joel Collins
3c27b5a6e6
Merge branch 'enable-ipv6' into 'master'
...
Enable ipv6
See merge request openflexure/openflexure-microscope-server!53
2020-04-23 09:45:25 +00: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
7fc202aea1
Merge branch 'click_to_move' into 'master'
...
Click to move
See merge request openflexure/openflexure-microscope-jsclient!47
2020-04-14 10:36:56 +00: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
aebec9b116
Merge branch 'master' into click_to_move
2020-04-10 15:32:10 +01:00
Richard Bowman
70d4c7e950
Merge branch 'master' into stage-calibration
2020-04-10 15:16:25 +01:00
