Commit graph

4774 commits

Author SHA1 Message Date
Joel Collins
a677bcb72f Merge branch 'master' of https://gitlab.com/openflexure/openflexure-microscope-jsclient 2019-05-02 11:52:17 +01:00
Joel Collins
f77c3293e8 Moved capture path out of metadata, into state 2019-05-02 11:52:03 +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
b6aef2d41d Update README.md 2019-05-01 16:11:05 +00: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
169d5cc5f4 Remove version from webapp archive 2019-04-30 15:24:57 +01:00
Joel Collins
fe921f90ba Updated electron-packager 2019-04-30 15:24:34 +01:00
jtc42
717d460cf5 Platform specific dependencies now optional 2019-04-27 15:02:35 +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
Joel Collins
a993a94649 Added example bottom tabs 2019-04-25 15:53:37 +01:00
Joel Collins
2e280b6bbf Moved icon import to main.js 2019-04-25 14:58:39 +01:00
Joel Collins
97cc5d2b78 Implemented NativeScript-Vue CLI Plugin 2019-04-25 14:35:52 +01:00
Joel Collins
1ffadb042f Created environment files for cross platform applications 2019-04-25 14:35:04 +01:00
Joel Collins
df4d99d408 Simplified conditional sidebar class 2019-04-25 14:34:39 +01:00
Joel Collins
12c7298023 Moved UI error handling to mixin 2019-04-25 14:22:40 +01:00
Joel Collins
55e527c229 Added mixins for modal notify and error 2019-04-25 14:21:22 +01:00
Joel Collins
133a623657 Fixed indentation 2019-04-25 14:20:41 +01:00
jtc42
a2a8c3b671 Updated versions 2019-04-19 09:24:23 +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
46008d8714 Fixed working on malformed JSON response in slow autofocus 2019-04-14 11:27:03 +01:00
Joel Collins
9f2d038aba Fixed sidebar show/hide events bubbling up 2019-04-14 11:16:26 +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
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
Joel Collins
1003aebdc5 Shifted version to 0.2.0 alpha 2019-04-09 10:04:51 +01:00
Joel Collins
7f8d6653ef Merge branch 'gain-exposure-controls' into 'master'
Added gain/exposure controls

See merge request openflexure/openflexure-microscope-jsclient!7
2019-04-09 06:29:18 +00:00
Richard Bowman
33f719894d Fixed if statement for updating camera config. 2019-04-09 06:27:07 +00:00
Joel Collins
b34a27cca9 Merge branch 'fast-autofocus-in-scanning' into 'master'
Fast autofocus in scanning

See merge request openflexure/openflexure-microscope-jsclient!6
2019-04-09 06:14:32 +00:00