Commit graph

58 commits

Author SHA1 Message Date
jtc42
4246746bdc Updated config API to use apply_config 2019-06-11 10:33:45 +01:00
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
3b9ef670fe Improved flake8 results 2019-05-24 16:32:20 +01:00
Joel Collins
e30956d761 Renamed video_resolution to stream_resolution 2019-05-20 10:55:43 +01:00
Joel Collins
092181348b Load capture objects from files. Remove YAML database. 2019-05-15 16:32:58 +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
f9fb6dc721 Default to not temporary 2019-04-09 14:57:19 +01: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
Joel Collins
6b3dca9f61 Fixed passing non-integers into preview window params 2019-02-25 14:23:08 +00:00
Joel Collins
3bf3b0f0c2 Fixed tag put route 2019-02-20 11:08:19 +00:00
Joel Collins
366b771b72 Added size and position params to GPU preview route 2019-02-19 11:04:12 +00:00
Joel Collins
51cd776700 Store stage position in metadata 2019-02-19 10:43:33 +00:00
Joel Collins
05f52bbdeb Process all initial tags in one call 2019-02-18 11:30:38 +00:00
Joel Collins
404f28a8e0 Add metadata and tags at capture-time 2019-02-14 17:00:27 +00:00
Joel Collins
0948c9308a Went on a PEP-8 rampage 2019-01-31 17:20:46 +00:00
Joel Collins
04bed170a0 Added JSON safety to config reads 2019-01-31 16:47:54 +00:00
Joel Collins
e9d74c07e6 Separated updating/writing from saving config 2019-01-31 13:51:02 +00:00
Joel Collins
8087e4d445 Updated to use apply_config and read_config instead of setters and getters 2019-01-31 13:34:14 +00:00
Joel Collins
6743882bf1 Corrected the abort code for missing resource 2019-01-29 14:43:22 +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
80cc74bd3d Fixed plugin blueprint method name clashing 2019-01-24 14:14:25 +00:00
Joel Collins
cb441201c6 Explicitally acquire camera lock 2019-01-24 14:05:45 +00:00
Joel Collins
27043240f3 Added explicit lock ecquisition 2019-01-24 14:05:05 +00:00
Joel Collins
a40cb9b9f6 Implemented basic threaded tasks for long-running functionality 2019-01-23 16:48:49 +00:00
Joel Collins
0dff9b6b39 Enable web UI to run when no stage is connected 2019-01-22 14:47:11 +00:00
Joel Collins
0e23ce8d0b Added web routes for tagging captures 2019-01-22 12:09:42 +00:00
Joel Collins
7a72b45b29 Added tags to capture metadata 2019-01-22 11:35:35 +00:00
Joel Collins
4e985fe80d Capture list now persists through server restart 2019-01-22 11:23:15 +00:00
Joel Collins
748c9b8b20 Routes now return position as a microscope stage sub-section 2019-01-21 10:49:46 +00:00
Joel Collins
a15e797ce4 Removed redundant as_attachment response 2019-01-18 16:07:50 +00:00
Joel Collins
533f5d9857 Added routes to download metadata yaml files 2019-01-18 15:27:11 +00:00
Joel Collins
63ffc0057a Added routes for new metadata methods 2019-01-18 14:50:08 +00:00
Joel Collins
8a4be49d46 Fixed resize docstring 2019-01-17 14:13:34 +00:00
Joel Collins
b0d5426f5b Bayer capture now optional 2019-01-17 10:22:41 +00:00
Joel Collins
25ecda8798 Fixed broken import 2019-01-16 14:59:18 +00:00
Joel Collins
1d1b501cbf Zoom POST now returns camera state, rather than whole microscope state 2019-01-16 12:01:45 +00:00
Joel Collins
0c5af96890 Added route for camera zoom 2019-01-16 11:50:05 +00:00
Joel Collins
709372208a Added route to retreive current overlay text 2019-01-16 11:25:56 +00:00
Joel Collins
65b50be0c5 Added API route to draw overlay text 2019-01-15 17:07:43 +00:00
Joel Collins
9c488279d2 Moved setting and getting stage config into root microscope config 2019-01-15 14:28:28 +00:00
Joel Collins
504c9b48a1 Moved camera config route into generic microscope config route 2019-01-15 14:01:52 +00:00
Joel Collins
6a374d093a Added API route to edit camera config 2019-01-15 12:17:14 +00:00
Joel Collins
a8c9a7e7dd Route to return microscope config 2019-01-15 11:48:10 +00:00
Joel Collins
1aad10c71b Removed redundant imports 2019-01-09 16:19:06 +00:00
Joel Collins
8367bd7192 Removed redundant imports 2019-01-09 15:58:16 +00:00
Joel Collins
81636aa6e9 Implemented new JSON response handler 2019-01-09 15:56:10 +00:00
Joel Collins
43247eb33b Minor formatting changes 2019-01-09 15:01:14 +00:00
Joel Collins
c1d0e95293 Removed travel limit in web API 2019-01-09 14:55:52 +00:00