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

333 commits

Author SHA1 Message Date
Joel Collins
65a28cc0f4 Default to new camera and stage settings slip 2019-06-05 16:03:17 +01:00
Joel Collins
0d8396b3e4 Fixed Microscope and camera arguments 2019-06-04 14:04:07 +01:00
Joel Collins
41d9ab51ad Restructured camera attaching 2019-06-04 14:03:46 +01:00
Joel Collins
f7ba68b443 Converted base camera into an ABC 2019-06-04 14:03:30 +01:00
Joel Collins
3cf166226b Converted config dict into properties/attributes 2019-06-04 14:03:16 +01:00
Joel Collins
5e6372835e Added extra debug log 2019-06-04 14:02:53 +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
c107125377 Skip loading invalid captures into array 2019-05-29 09:32:14 +01:00
Joel Collins
2c4fa4aead Return empty dict if capture is corrupt 2019-05-29 09:29:46 +01:00
Joel Collins
9ab1da34ff Handle corrupt captures 2019-05-29 09:28:42 +01:00
Joel Collins
60c49a8331 Fixed setting Iterable vs Int backlash 2019-05-28 09:28:08 +01:00
Joel Collins
5e34b998dd Fixed plugin calling old focus_rel method 2019-05-28 09:27:47 +01:00
Joel Collins
39e2e0baad Re-implemented scan methods 2019-05-27 13:35:53 +01:00
Joel Collins
5a22d0d308 Re-added timeout parameters (previous commit broke) 2019-05-24 16:47:04 +01:00
Joel Collins
3b9ef670fe Improved flake8 results 2019-05-24 16:32:20 +01:00
Joel Collins
90a3a738af Cleaned up camera locks 2019-05-23 14:25:57 +01:00
Joel Collins
8e35ef2b29 Added locked() method to check lock state 2019-05-23 14:25:26 +01:00
Joel Collins
e30956d761 Renamed video_resolution to stream_resolution 2019-05-20 10:55:43 +01:00
Joel Collins
8c3cd48f4d Automatically move old config file to new config file 2019-05-20 10:24:50 +01:00
Joel Collins
b0e724a706 Fixed naming of default config placeholder 2019-05-20 10:14:55 +01:00
Joel Collins
9fc4dfc628 Moved microscoperc.yaml to microscope_settings.yaml 2019-05-20 10:09:01 +01:00
Joel Collins
1fe8ea18d8 Default capture resolution to MAX_RESOLUTION 2019-05-20 10:06:42 +01:00
Joel Collins
78882ab4c5 Removed debug print 2019-05-20 10:06:15 +01:00
Joel Collins
092181348b Load capture objects from files. Remove YAML database. 2019-05-15 16:32:58 +01:00
Joel Collins
31c6c284ab Fixed __init__ imports in stage module 2019-05-15 15:34:31 +01:00
Joel Collins
63c0492022 Added route to download logfile 2019-05-15 15:30:28 +01:00
Joel Collins
ff534e6a51 Initial support for SBv3 and MockStage 2019-05-15 13:25:04 +01:00
Joel Collins
727c3ee715 Removed old client from API root 2019-05-05 20:59:57 +01:00
Joel Collins
2108dea007 Defaut new images to write to file 2019-05-01 14:46:00 +01: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
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
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
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