rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into fast-autofocus-in-scanning

Browse source 
Updating with new URL for autofocus

Some of the buttons have stopped working - this will make the clinet match changes in the server.
This commit is contained in:
Richard Bowman 2019-04-08 20:07:41 +01:00
commit 5e40af1b2f
4 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
installers/make.ps1
View file

@ -12,7 +12,7 @@ $wslroot = (wsl wslpath -a ("$root" -Replace '\\','\\'))
mkdir "$root/release-builds/dist/$version/" mkdir "$root/release-builds/dist/$version/"
echo "Gzipping PWA..." echo "Gzipping PWA..."
wsl tar -czvf "$wslroot/release-builds/dist/$version/${name}_${version}_pwa.tar.gz" -C "$wslroot/dist" . wsl tar -czvf "$wslroot/release-builds/dist/$version/${name}_${version}_web.tar.gz" -C "$wslroot/dist" .
echo "Building deb packages..." echo "Building deb packages..."
wsl node "$wslhere/create-deb-x64.js" wsl node "$wslhere/create-deb-x64.js"

2
package.json
View file

@ -6,7 +6,7 @@
"author": "OpenFlexure", "author": "OpenFlexure",
"description": "An electron-based user client for the OpenFlexure Microscope Server", "description": "An electron-based user client for the OpenFlexure Microscope Server",
"main": "app.js", "main": "app.js",
"version": "0.1.1", "version": "0.1.2-beta",
"license": "GNU General Public License v3.0 ", "license": "GNU General Public License v3.0 ",
"private": true, "private": true,
"scripts": { "scripts": {

4
src/App.vue
View file

@ -50,9 +50,13 @@ export default {
created: function () { created: function () {
var context = this var context = this
UIkit.util.on(document, 'hidden', '.toggle-hidden', function () { UIkit.util.on(document, 'hidden', '.toggle-hidden', function () {
// BUG: This gets called every time a tab switches. Really shouldn't
console.log("Sidebar hidden")
context.$root.$emit('globalResizePreview') context.$root.$emit('globalResizePreview')
}) })
UIkit.util.on(document, 'shown', '.toggle-hidden', function () { UIkit.util.on(document, 'shown', '.toggle-hidden', function () {
// BUG: This gets called every time a tab switches. Really shouldn't
console.log("Sidebar shown")
context.$root.$emit('globalResizePreview') context.$root.$emit('globalResizePreview')
}) })

2
src/components/paneNavigate.vue
View file

@ -282,7 +282,7 @@ export default {
return this.$store.getters.uri + "/plugin/default/autofocus/autofocus" return this.$store.getters.uri + "/plugin/default/autofocus/autofocus"
}, },
fastAutofocusApiUri: function () { fastAutofocusApiUri: function () {
return this.$store.getters.uri + "/plugin/default/fast_autofocus/fast_autofocus" return this.$store.getters.uri + "/plugin/default/autofocus/fast_autofocus"
} }
} }