Joel Collins
74f6093245
Merge branch '1.0.1-dev-cleanup' into 'master'
...
1.0.1 dev - Renamed video_resolution to stream_resolution
See merge request openflexure/openflexure-microscope-server!19
2019-05-20 10:30:44 +00:00
Joel Collins
e30956d761
Renamed video_resolution to stream_resolution
2019-05-20 10:55:43 +01:00
Joel Collins
36ee715fcb
Updated dependencies
2019-05-20 10:38:51 +01:00
Joel Collins
805c17b509
Merge branch 'resolution-fix' into 'master'
...
Default resolution fix
See merge request openflexure/openflexure-microscope-server!18
2019-05-20 09:29:35 +00: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
bc869794e4
Merge branch 'exif-capture-reload' into 'master'
...
Load capture objects from files. Remove YAML database.
See merge request openflexure/openflexure-microscope-server!17
2019-05-15 15:33:35 +00:00
Joel Collins
092181348b
Load capture objects from files. Remove YAML database.
2019-05-15 16:32:58 +01:00
Joel Collins
f8e647198a
Merge branch 'doc-fix' into 'master'
...
Fixed __init__ imports in stage module
See merge request openflexure/openflexure-microscope-server!16
2019-05-15 14:34:57 +00:00
Joel Collins
31c6c284ab
Fixed __init__ imports in stage module
2019-05-15 15:34:31 +01:00
Joel Collins
c5183f79b1
Merge branch 'log-route' into 'master'
...
Added route to download logfile
See merge request openflexure/openflexure-microscope-server!15
2019-05-15 14:30:59 +00:00
Joel Collins
63c0492022
Added route to download logfile
2019-05-15 15:30:28 +01:00
Joel Collins
d54a35e197
Merge branch 'sangaboard3-support' into 'master'
...
Initial support for SBv3 and MockStage
See merge request openflexure/openflexure-microscope-server!14
2019-05-15 12:26:50 +00:00
Joel Collins
ff534e6a51
Initial support for SBv3 and MockStage
2019-05-15 13:25:04 +01:00
Joel Collins
068ce9e751
Update CONTRIBUTING.md
2019-05-07 11:06:42 +00:00
Joel Collins
c57d2fb8c8
Add CONTRIBUTING
2019-05-07 10:39:48 +00:00
Joel Collins
5f1e17e1da
Merge branch '1.0.1-dev' into 'master'
...
Removed old client from API root
See merge request openflexure/openflexure-microscope-server!13
2019-05-05 20:39:43 +00:00
Joel Collins
727c3ee715
Removed old client from API root
2019-05-05 20:59:57 +01:00
Joel Collins
1233482a01
Merge branch 'new-rtd' into 'master'
...
Updated RTD config to pip install from repo
See merge request openflexure/openflexure-microscope-server!12
2019-05-05 19:50:13 +00:00
Joel Collins
772e36f168
Updated RTD config to pip install from repo
2019-05-05 19:50:13 +00:00
Joel Collins
530f735ebd
Updated dependencies (actually)
2019-05-05 00:07:19 +01:00
Joel Collins
b1711afc27
Updated RTD requirements
2019-05-02 10:59:35 +01:00
Joel Collins
f5d7d5a32b
Iterated to 1.0.0
2019-05-02 10:28:42 +01:00
Joel Collins
2f86901ddd
Merge branch 'master' of https://gitlab.com/openflexure/openflexure-microscope-server
2019-05-02 10:26:40 +01:00
Joel Collins
ac7838b5f8
Fixed awful typo
2019-05-01 16:10:17 +00:00
Joel Collins
2108dea007
Defaut new images to write to file
2019-05-01 14:46:00 +01:00
Joel Collins
f72bf1156f
Update README.md
2019-05-01 13:21:30 +00: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
537e01c6da
Iterated version
2019-04-19 09:12:51 +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
cf60343ccb
Updated poetry lock file
2019-04-18 13:34:47 +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
7088d78244
Merge branch 'gain-exposure-settings' into 'master'
...
Gain & exposure settings
See merge request openflexure/openflexure-microscope-server!8
2019-04-09 14:00:27 +00:00
