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

103 commits

Author SHA1 Message Date
Joel Collins
e30956d761 Renamed video_resolution to stream_resolution 2019-05-20 10:55:43 +01:00
Joel Collins
1fe8ea18d8 Default capture resolution to MAX_RESOLUTION 2019-05-20 10:06:42 +01:00
Joel Collins
092181348b Load capture objects from files. Remove YAML database. 2019-05-15 16:32:58 +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
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
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
e281b1ecc3 Removed a bit of logging vomit 2019-04-09 15:05:56 +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
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
Richard Bowman
ef3aeb0581 Added fast autofocus 2019-04-07 19:58:08 +01:00
Joel Collins
4602b1da9d Testing not re-saving EXIF on exit 2019-03-28 14:45:51 +00:00
Joel Collins
2cdc20b08e Handle empty or malformed capture list 2019-03-28 14:18:01 +00:00
Joel Collins
b5e6a43caa Spinkled in some sleeps to fix 
#49
 2019-03-21 15:48:22 +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
951cfb6bb0 Fixed exception caused by applying invalid settings to picamera 2019-02-25 11:09:21 +00:00
Joel Collins
31efadd884 Removed debug code 2019-02-19 13:41:58 +00:00
Joel Collins
e738837101 Fixed broken piexif imports 2019-02-19 13:26:18 +00:00
Joel Collins
c6eb6148cc Packaged basic Piexif module 2019-02-19 12:02:11 +00:00
Joel Collins
366b771b72 Added size and position params to GPU preview route 2019-02-19 11:04:12 +00:00
Joel Collins
184e3d9558 Fixed format checks for loading exif data 2019-02-18 17:25:50 +00:00
Joel Collins
e8fb3b378c Fixed missing capture validation 2019-02-18 12:11:33 +00:00
Joel Collins
ab70a3857c Only use exif if supported format 2019-02-18 11:48:56 +00:00
Joel Collins
05f52bbdeb Process all initial tags in one call 2019-02-18 11:30:38 +00:00
Joel Collins
340b3dda89 Initial testing for exif metadata 2019-02-18 10:53:18 +00:00
Joel Collins
2314084cb1 Made thumbnails bigger, for new Vue client 2019-02-14 17:18:26 +00:00
Joel Collins
ed12cc7bce Fixed metadata and tags not storing to capture DB on update or exit 2019-02-13 15:17:52 +00:00
Joel Collins
1436e58283 Improed CaptureObject documentation 2019-02-06 15:18:02 +00:00
Joel Collins
5672b82f5e Added many many debug statements to help debug issue #32 2019-02-05 17:06:05 +00:00
Joel Collins
0948c9308a Went on a PEP-8 rampage 2019-01-31 17:20:46 +00:00
Joel Collins
d4e7d067a3 Removed fraction conversion 2019-01-31 16:48:39 +00:00
Joel Collins
5471ffa62b Introduced apply_config and read_config methods 2019-01-31 13:29:07 +00:00
Joel Collins
cb122e5ef6 Moved static methods to functions 2019-01-31 13:27:35 +00:00
Joel Collins
92ac947982 Demoted missing attribute warning to debug 2019-01-30 18:23:40 +00:00
Joel Collins
f2a3261b03 Overhauled config loader to allow split configs 2019-01-30 17:45:11 +00:00