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
Richard Bowman
a318c19826
Merge branch 'v2.1.0-dev' into click_to_move
2020-03-26 14:38:24 +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
2af671f2d5
Merge branch 'v2.1.0-dev' into 'master'
...
V2.1.0 dev
See merge request openflexure/openflexure-microscope-jsclient!45
2020-03-26 11:53:36 +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
8b9cf9c0c7
Changed version to 2.1
2020-03-25 16:44:36 +00:00
Joel Collins
d427a81cb7
Merge remote-tracking branch 'origin/master' into v2.1.0-dev
2020-03-25 16:43:53 +00:00
Joel Collins
6105dc63b5
Fixed tab switcher width
2020-03-25 16:43:19 +00:00
Richard Bowman
8a2a2abbec
Merge branch 'v2.1.0-dev' into stage-calibration
2020-03-25 16:36:41 +00:00
Richard Bowman
0e88ad130b
Use new click-to-move API route
...
This modifies the client to use the new move_in_image_coordinates API route
provided by the camera_stage_mapping plugin.
NB I've not yet deleted vestigial code relating to the "FoV" property.
2020-03-25 05:50:42 +00:00
Richard Bowman
2ba9c9493b
Added a pane for camera/stage calibration
2020-03-25 05:24:10 +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
4784257eb1
Added another button
2020-03-24 17:42:11 +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
Richard Bowman
4b7d6eded6
added a button to flatten the lens shading table
2020-03-24 17:21:57 +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
0fc1936379
Iterate to 2.0.0
2020-03-24 11:15:50 +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
9c309fc791
Added support for loading extension Web Components
2020-03-18 17:51:10 +00:00
Joel Collins
0a1b138bcb
Improved gallery layout
2020-03-17 17:39:20 +00:00
Joel Collins
d8626b7e13
Improved settings layout
2020-03-17 17:39:11 +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
a9506c4abc
Enable extension-defined choice of view panel
2020-03-17 15:08:59 +00:00
Joel Collins
a8730d0a15
If connected, update components on mount
2020-03-17 15:08:39 +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
