Commit graph

65 commits

Author SHA1 Message Date
jtc42
8c3302644a Automatically add microscope ID and name to metadata 2019-06-07 17:28:57 +01:00
jtc42
235aa984f9 Updated docs 2019-06-07 13:37:20 +01:00
Joel Collins
70be245c2a Ensure stream recording at start of fast_up_down_up_autofocus 2019-05-30 10:43:46 +01:00
Joel Collins
5e34b998dd Fixed plugin calling old focus_rel method 2019-05-28 09:27:47 +01:00
Joel Collins
092181348b Load capture objects from files. Remove YAML database. 2019-05-15 16:32:58 +01:00
Joel Collins
ff534e6a51 Initial support for SBv3 and MockStage 2019-05-15 13:25:04 +01: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
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
915958885b Added temporary support to scans 2019-04-09 14:57:28 +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
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
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
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
Joel Collins
980e64397d Improved scan metadata 2019-03-28 17:34:50 +00:00
Joel Collins
6237762309 Combined stack and tile scans 2019-03-28 14:18:14 +00:00
Joel Collins
89ea6a69de Fixed imports, and PEP8 styling 2019-03-07 10:58:08 +00:00
Joel Collins
298bc2ba6a Added scan API routes 2019-03-07 09:54:43 +00:00
Joel Collins
d10263adf8 Added arg to affix metadata and tags to scans 2019-03-07 09:53:25 +00:00
Joel Collins
cd4bab94ab Renamed stack plugin to scan 2019-03-06 21:08:56 +00:00
Joel Collins
4d82b4df8a Initial tile/stack plugin 2019-03-06 17:04:32 +00:00
Joel Collins
e175bb1f92 Fixed broken plugin namespace 2019-03-06 17:04:18 +00:00
Richard Bowman
0520f058ad Explicitly set ISO=0 (auto) when adjusting gain. 2019-02-05 18:42:50 +00:00
Joel Collins
0948c9308a Went on a PEP-8 rampage 2019-01-31 17:20:46 +00:00
Joel Collins
036fb82628 Moved calibration plugin to defaults. Save config when calibration finishes. 2019-01-31 16:46:34 +00:00
Joel Collins
e9d74c07e6 Separated updating/writing from saving config 2019-01-31 13:51:02 +00:00
Joel Collins
4450ee132e Moved autofocus plugin to its own module 2019-01-30 13:51:20 +00:00
Joel Collins
a6791d55ac Plugin routes are now fully qualified 2019-01-30 13:51:09 +00:00
Joel Collins
0c156128fc Minor formatting changes 2019-01-30 12:02:35 +00:00
Richard Bowman
416b74cb4a A plugin to allow recalibration via the web API
This adds a plugin with a single endpoint, "recalibrate".
The recalibrate methods are deliberately simple and not aware
of the StreamingCamera because I want to share the maximum
amount of code with non-microscope projects that also want
to flatten the lens shading.

The plugin is microscope-specific, and therefore handles
shutting down the stream and managing the resolution of
the camera, to allow the calibration to run without
restarting the microscope server.

Currently it **DOES NOT SAVE SETTINGS**.

TODO: save the settings after recalibration.

Arguably this isn't a job for this plugin, what we would
need is:
* A method to sync the StreamingCamera's settings with the
  underlying PiCamera object
* A method to save the StreamingCamera's settings to disk.
I think it would be neatest to provide the first of these as
a method of the StreamingCamera class, and call it from the
plugin.  Saving the settings to disk (e.g. to the microscope
rc file, or to somewhere else) should be a separate endpoint
(although most interfaces will probably call it immediately
after recalibration).
2019-01-30 09:10:33 +00:00
Joel Collins
d7e19c40e2 Included Richards autofocus plugin in defaults 2019-01-29 13:54:47 +00:00
Joel Collins
bda946bcc9 Errors in plugins no longer caught as if the module just didn't exist 2019-01-29 13:42:32 +00:00
Joel Collins
a11d2145d9 Fixed broken error handling for long-running tasks 2019-01-28 17:49:44 +00:00
Joel Collins
465ed647d3 Fixed docstrings 2019-01-24 16:24:14 +00:00
Joel Collins
9860ace394 Fixed broken legacy import 2019-01-24 14:09:47 +00:00
Joel Collins
5c86c7f350 Updated to use CompositeLock 2019-01-24 14:05:25 +00:00
Joel Collins
4be89866ee Added lock to stage positioning 2019-01-24 13:28:46 +00:00
Joel Collins
8292ebf7c7 Implement hardware locks 2019-01-24 12:11:01 +00:00
Joel Collins
a40cb9b9f6 Implemented basic threaded tasks for long-running functionality 2019-01-23 16:48:49 +00:00
Joel Collins
4bd6a562d3 Better example of JsonPayload use 2019-01-09 16:33:36 +00:00
Joel Collins
fb1f848a83 Updated example plugin to use new JsonPayload 2019-01-09 16:23:30 +00:00
Joel Collins
eb5c9c3fee Updated simple plugin test 2019-01-08 16:15:39 +00:00
Joel Collins
95a3abde7e Restructured builtin plugins and docstrings 2018-12-20 15:44:43 +00:00
Joel Collins
d681a2069d Started re-writing plugin documentation 2018-12-20 11:31:50 +00:00
Joel Collins
6d464349b7 Completely rewritten plugin loader to accept absolute modules, or single file paths 2018-12-12 15:00:30 +00:00