rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
400 commits 1 branch 0 tags 24 MiB
Commit graph

294 commits

Author SHA1 Message Date
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
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
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
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
4602b1da9d Testing not re-saving EXIF on exit 2019-03-28 14:45:51 +00:00
Joel Collins
6237762309 Combined stack and tile scans 2019-03-28 14:18:14 +00:00
Joel Collins
2cdc20b08e Handle empty or malformed capture list 2019-03-28 14:18:01 +00:00
Joel Collins
ebce044fc2 Fixed issue 51 2019-03-28 11:47:56 +00:00
Joel Collins
a98158634c Close the camera if the stage cannot be opened 2019-03-21 17:48:45 +00:00
Joel Collins
6b9a34437e Allow serial exceptions to be raised 2019-03-21 17:48:34 +00:00
Joel Collins
b5e6a43caa Spinkled in some sleeps to fix 
#49
 2019-03-21 15:48:22 +00:00
Joel Collins
dd4b0caf59 Fixed kwargs RST bug 2019-03-19 16:59:43 +00:00
Joel Collins
d445b359e9 Let gunicorn handle logging 2019-03-19 12:46:16 +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
Joel Collins
2fe7722da6 Added subdirectory support for captures 2019-03-06 17:04:04 +00:00
Joel Collins
51ac8a0647 Disabled stream timeout by default 2019-02-26 13:53:33 +00:00
Joel Collins
f54250a638 Catch already-recording error when starting GPU preview 2019-02-25 18:15:16 +00:00
Joel Collins
6b3dca9f61 Fixed passing non-integers into preview window params 2019-02-25 14:23:08 +00:00
Joel Collins
951cfb6bb0 Fixed exception caused by applying invalid settings to picamera 2019-02-25 11:09:21 +00:00
Joel Collins
b9bb89ce3f Fixed HTTP exceptions not returning with correct HTTP status code 2019-02-20 13:26:21 +00:00
Joel Collins
3bf3b0f0c2 Fixed tag put route 2019-02-20 11:08:19 +00:00
Joel Collins
7d9f7278f1 Fixed camera config being overwritten instead of updated 2019-02-20 10:31:02 +00:00
Joel Collins
4f2cf79a26 Task route now returns a dictionary with task ID as key 2019-02-19 16:12:14 +00:00