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
Joel Collins
49afbf3e8f
Merge branch 'fast-autofocus-in-scanning' into 'master'
...
Fast autofocus in scanning
See merge request openflexure/openflexure-microscope-server!7
2019-04-09 06:13:32 +00:00
Richard Bowman
e6649e41d8
Added gain/exposure controls
...
Also refactored settings pane slightly.
2019-04-08 22:44:51 +01: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
5e40af1b2f
Merge branch 'master' into fast-autofocus-in-scanning
...
Updating with new URL for autofocus
Some of the buttons have stopped working - this will make the clinet match changes in the server.
2019-04-08 20:07:41 +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
86c7260061
Added an option to do fast autofocus in scan mode
2019-04-08 16:21:19 +01:00
Joel Collins
d2899d5055
Added bug note
2019-04-08 16:20:00 +01:00
Joel Collins
118ccaab6c
Updated to new fast_autofocus URI
2019-04-08 16:19:05 +01:00
Richard Bowman
7e83d724b8
Added fast autofocus integrated with Z stacking in the scan code
2019-04-08 16:12:31 +01:00