Joel Collins
|
8f12e395a6
|
2.5.0-beta.1
|
2020-09-09 16:44:36 +01:00 |
|
Joel Collins
|
36747c33d7
|
Updated dependencies
|
2020-09-09 16:43:11 +01:00 |
|
Joel Collins
|
5ca386bde1
|
Merge branch 'deltastage' into 'master'
Deltastage
See merge request openflexure/openflexure-microscope-server!69
|
2020-09-09 15:18:25 +00:00 |
|
Joel Collins
|
fa20475ab7
|
Merge branch 'integrated-slidescan' into 'master'
Integrated slidescan
See merge request openflexure/openflexure-microscope-server!71
|
2020-09-09 15:17:45 +00:00 |
|
Joel Collins
|
9a3ba335c1
|
Made scan parameters editable (dev only for now)
|
2020-09-09 13:21:58 +01:00 |
|
Joel Collins
|
41eff92e7d
|
Updated Action status strings
|
2020-09-09 13:21:40 +01:00 |
|
Joel Collins
|
a34f98275b
|
Updated scan tab icon
|
2020-09-09 13:21:21 +01:00 |
|
Joel Collins
|
f0ce85fc3f
|
Added app setting to enable/disable IHI slidescan
|
2020-09-09 12:54:44 +01:00 |
|
Joel Collins
|
de7f4f6dfe
|
Drafted integrated slide scan
|
2020-09-09 12:16:06 +01:00 |
|
Joel Collins
|
2ce58f2aee
|
Merge branch 'master' of https://gitlab.com/openflexure/openflexure-microscope-server
|
2020-09-07 16:33:01 +01:00 |
|
Joel Collins
|
54c342bbbb
|
Switch to picamerax
|
2020-09-07 16:31:59 +01:00 |
|
Joel Collins
|
86eeac32ea
|
Merge branch 'labthings-100-dev' into 'master'
Labthings 100 dev
See merge request openflexure/openflexure-microscope-server!70
|
2020-09-07 15:30:24 +00:00 |
|
Joel Collins
|
0bff4bdb62
|
Updated camera-stage-mapping to 0.1.4
|
2020-09-07 15:29:40 +01:00 |
|
Samuel McDermott
|
6dcd6601c4
|
Include option for delta stage in microscope initialisation
|
2020-09-06 17:38:57 +01:00 |
|
Joel Collins
|
304002d747
|
Updated CSM and testing LabThings branch
|
2020-09-04 17:41:59 +01:00 |
|
Joel Collins
|
5139b24ffe
|
Updated to new LabThings structure
|
2020-09-04 15:48:52 +01:00 |
|
Samuel McDermott
|
5e9e8cb2a3
|
Merge remote-tracking branch 'origin/master' into deltastage
|
2020-08-27 15:46:17 +01:00 |
|
Joel Collins
|
304e620143
|
Switch microscope ID to URN suffix string
|
2020-08-14 15:31:44 +01:00 |
|
Joel Collins
|
f0c03d08a5
|
2.4.1
|
2020-08-11 15:26:28 +01:00 |
|
Joel Collins
|
0b44944dd4
|
2.4.0
|
2020-07-24 10:54:07 +01:00 |
|
Joel Collins
|
ccd199a207
|
v2.4.0-rc.1
|
2020-07-22 17:15:53 +01:00 |
|
Joel Collins
|
5d34ec615a
|
Client 2.4.0
|
2020-07-22 16:52:43 +01:00 |
|
Joel Collins
|
fea256959b
|
Fixed capture stream-flash animation hanging around afterwards
|
2020-07-22 16:52:05 +01:00 |
|
Joel Collins
|
76664363dc
|
Show indeterminate progress as soon as action is requested
|
2020-07-22 16:40:46 +01:00 |
|
Joel Collins
|
72293627b7
|
Merge branch 'master' of https://gitlab.com/openflexure/openflexure-microscope-server
|
2020-07-22 16:22:08 +01:00 |
|
Joel Collins
|
e110045dd3
|
Increased default_stop_timeout on TileScanAPI
|
2020-07-22 16:11:26 +01:00 |
|
Joel Collins
|
5c99da264f
|
Added posh stop to slow autofocus
|
2020-07-22 16:11:13 +01:00 |
|
Joel Collins
|
bb89d2fb3b
|
2.4.0-beta.2
|
2020-07-22 16:05:35 +01:00 |
|
Joel Collins
|
d7f4ee48d0
|
Updated LabThings to 0.8.0rc2
|
2020-07-22 15:34:18 +01:00 |
|
Joel Collins
|
24338aec4d
|
2.4.0-beta.1
|
2020-07-21 13:18:11 +01:00 |
|
Joel Collins
|
2e8149c130
|
Switched to LabThings 0.8.0rc1 from PyPI
|
2020-07-21 13:17:00 +01:00 |
|
Joel Collins
|
24398ba7dc
|
Updated tasks nomenclature
|
2020-07-21 12:54:42 +01:00 |
|
Joel Collins
|
56051f8863
|
Updated LabThings to 0.8.0-beta.3
|
2020-07-21 12:04:26 +01:00 |
|
Joel Collins
|
ee738d5319
|
Fixed capture marshalling
|
2020-07-21 11:57:41 +01:00 |
|
Joel Collins
|
54c5605cb1
|
Removed use of deprecated current_task_stopped
|
2020-07-21 11:57:33 +01:00 |
|
Joel Collins
|
c8c66803e5
|
Updated setting LabThings JSON encoder
|
2020-07-21 11:57:22 +01:00 |
|
Joel Collins
|
9f61935cf4
|
Updated LabThingsJSONEncoder import
|
2020-07-21 11:57:08 +01:00 |
|
Joel Collins
|
89f751cc47
|
Updated CSM
|
2020-07-15 17:28:20 +01:00 |
|
Joel Collins
|
fccc58fd62
|
Added lock acquisition to preview functions
|
2020-07-15 17:18:23 +01:00 |
|
Joel Collins
|
4bf866b66b
|
Added fancy-stopping to scan task
|
2020-07-15 16:54:34 +01:00 |
|
Joel Collins
|
3703a9b2b0
|
Updated LabThings
|
2020-07-15 16:54:20 +01:00 |
|
Joel Collins
|
e3b7e9af8d
|
Updated dependencies
|
2020-07-15 16:12:52 +01:00 |
|
Joel Collins
|
d406b03354
|
Fixed swagger-ui links
|
2020-07-15 16:03:14 +01:00 |
|
Joel Collins
|
a85343cdad
|
Updated dependencies
|
2020-07-15 15:51:01 +01:00 |
|
Joel Collins
|
1a4f5ff8bc
|
Simplified log handlers
|
2020-07-15 15:47:57 +01:00 |
|
Joel Collins
|
db8f76f8f6
|
Switched to LabThings 0.8.0 beta
|
2020-07-15 15:46:23 +01:00 |
|
Joel Collins
|
7310492c35
|
2.3.1
|
2020-07-06 13:34:06 +01:00 |
|
Joel Collins
|
2c38a7dc43
|
Delegate starting stream worker
|
2020-07-06 13:33:17 +01:00 |
|
Joel Collins
|
6e22376d9e
|
Start streamer on init and never time out
|
2020-07-06 13:27:18 +01:00 |
|
Joel Collins
|
ae8e55fcda
|
2.3.0
|
2020-07-06 11:50:09 +01:00 |
|