Joel Collins
1233482a01
Merge branch 'new-rtd' into 'master'
...
Updated RTD config to pip install from repo
See merge request openflexure/openflexure-microscope-server!12
2019-05-05 19:50:13 +00:00
Joel Collins
772e36f168
Updated RTD config to pip install from repo
2019-05-05 19:50:13 +00:00
Joel Collins
530f735ebd
Updated dependencies (actually)
2019-05-05 00:07:19 +01:00
Joel Collins
b1711afc27
Updated RTD requirements
2019-05-02 10:59:35 +01:00
Joel Collins
f5d7d5a32b
Iterated to 1.0.0
2019-05-02 10:28:42 +01:00
Joel Collins
2f86901ddd
Merge branch 'master' of https://gitlab.com/openflexure/openflexure-microscope-server
2019-05-02 10:26:40 +01:00
Joel Collins
ac7838b5f8
Fixed awful typo
2019-05-01 16:10:17 +00:00
Joel Collins
2108dea007
Defaut new images to write to file
2019-05-01 14:46:00 +01:00
Joel Collins
f72bf1156f
Update README.md
2019-05-01 13:21:30 +00:00
Joel Collins
638e8245ad
Fixed merge conflict artefact
2019-04-26 18:34:49 +01:00
Joel Collins
fface9994e
Fixed merge conflicts and simplified new capture creation
2019-04-26 18:32:32 +01:00
Joel Collins
ea44bbefd2
Simplified creation of new capture objects
2019-04-26 18:26:27 +01:00
jtc42
537e01c6da
Iterated version
2019-04-19 09:12:51 +01:00
jtc42
b7a457fce1
Tidied up todos
2019-04-19 09:11:48 +01:00
jtc42
8a564bbdba
Fixed default video folder NoneType
2019-04-19 09:06:14 +01:00
jtc42
9b016a76b2
Removed redundant capture initialisation
2019-04-19 09:05:57 +01:00
jtc42
cf60343ccb
Updated poetry lock file
2019-04-18 13:34:47 +01:00
jtc42
06a9aeeba5
Added route to list all routes
2019-04-18 12:41:32 +01:00
jtc42
10525c9c8e
Rewritten how file names are constructed and restored
2019-04-18 12:17:59 +01:00
Joel Collins
28561433a0
Malformed capture db no longer crashes server
2019-04-15 19:14:31 +01:00
Joel Collins
b7ee18d081
Better handling of GPU preview resizing
2019-04-14 11:31:48 +01:00
Joel Collins
793a3f0b63
Merge branch 'gain-exposure-settings' into 'master'
...
Fixed camera's read_config method
See merge request openflexure/openflexure-microscope-server!11
2019-04-14 09:04:03 +00:00
Joel Collins
941aadebfe
Merge branch 'temporary-scan-captures' into 'master'
...
Temporary scan captures
See merge request openflexure/openflexure-microscope-server!10
2019-04-14 09:00:21 +00:00
Joel Collins
62b70e5bae
clear_tmp now properly removes the tmp capture tree
2019-04-14 09:55:51 +01:00
Richard Bowman
bd5843cec7
Fixed camera's read_config method
...
read_config was only returning keys already present in the camera's config dictionary, which meant that if the camera settings were reset/deleted, it no longer read the settings from the picamera object. I've changed it to use CONFIG_KEYS instead, which I believe is the correct behaviour.
2019-04-11 16:45:30 +01:00
Joel Collins
7cf54240be
Temp capture folder now handled by camera
2019-04-11 07:13:32 +01:00
Joel Collins
a1965f606c
Removed redundant z-stack import
2019-04-09 15:12:31 +01:00
Joel Collins
e281b1ecc3
Removed a bit of logging vomit
2019-04-09 15:05:56 +01:00
Joel Collins
7088d78244
Merge branch 'gain-exposure-settings' into 'master'
...
Gain & exposure settings
See merge request openflexure/openflexure-microscope-server!8
2019-04-09 14:00:27 +00:00
Joel Collins
915958885b
Added temporary support to scans
2019-04-09 14:57:28 +01:00
Joel Collins
f9fb6dc721
Default to not temporary
2019-04-09 14:57:19 +01:00
Joel Collins
61f15d610f
Restructured how temporary paths are calculated
2019-04-09 14:52:08 +01:00
Richard Bowman
33f719894d
Fixed if statement for updating camera config.
2019-04-09 06:27:07 +00:00
Joel Collins
49afbf3e8f
Merge branch 'fast-autofocus-in-scanning' into 'master'
...
Fast autofocus in scanning
See merge request openflexure/openflexure-microscope-server!7
2019-04-09 06:13:32 +00:00
Richard Bowman
e6ec800c21
Fixed camera settings
...
Since splitting the camera config into a separate YAML file, we've broken
the ability to change the camera's configuration via the API (or at any time
except when the camera is set up, I think). This (mostly) fixes that, though
I get type errors that I've had to work around (e.g. when setting
shutter_speed), see `pi.py`
2019-04-08 22:41:12 +01:00
Richard Bowman
e90eb7c2d4
deleted old autofocus plugin
2019-04-08 22:40:50 +01:00
Richard Bowman
7aea6291c7
Refactored fast autofocus
...
Tidied up the fast autofocus code, including moving the bulk of the
new code from the `scan` plugin into `autofocus` and updating it to
reflect the fact that the autofocus plugin now merges both old and
new functionality (i.e. fast_autofocus is no longer a separate
plugin). Also fixed a bug that caused it to overshoot on scans.
2019-04-08 19:56:29 +01:00
Richard Bowman
7e83d724b8
Added fast autofocus integrated with Z stacking in the scan code
2019-04-08 16:12:31 +01:00
Richard Bowman
1cf1e40c54
Added a lock to stop_preview for good measure
2019-04-08 14:06:14 +01:00
Richard Bowman
ec50d245ab
Added a lock to start_preview and caught errors
2019-04-08 14:05:29 +01:00
Joel Collins
24ded8de32
Restructured fast autofocus into main autofocus plugin
2019-04-08 15:09:36 +03:00
Joel Collins
edc5e7c241
Fixed malformed JSONIFY task responses
2019-04-08 08:10:57 +01:00
Joel Collins
10bafe1281
Replace missing configs with empty dictionary
2019-04-08 08:08:30 +01:00
Joel Collins
6e4e0fac54
Added fast_autofocus to defaults
2019-04-08 07:05:16 +00:00
Joel Collins
deae5d117a
Merge branch 'fast-autofocus' into 'master'
...
Added fast autofocus to default plugins
See merge request openflexure/openflexure-microscope-server!6
2019-04-08 06:57:47 +00:00
Richard Bowman
ef3aeb0581
Added fast autofocus
2019-04-07 19:58:08 +01:00
Richard Bowman
bb8312835a
Auto-calibrate now correctly freezes settings
2019-04-04 17:04:38 +01:00
Joel Collins
bff0db6463
Iterated to RC3
2019-04-01 10:36:34 +01:00
Joel Collins
f30d48e59d
Added brief wait before z-stack captures
2019-03-29 17:32:57 +00:00
Joel Collins
b5c0acb705
Improved scan argument parsing
2019-03-29 16:17:24 +00:00
