Merge remote-tracking branch 'origin/master' into imjoy-support

Merge in changes from master,

This matters because we need to get the fixes to Python
package management and the stage API for absolute moves.
This commit is contained in:
Richard 2021-04-27 12:25:12 +01:00
commit 6b8d34761c
16 changed files with 1918 additions and 196 deletions

View file

@ -2,7 +2,7 @@
<div>
<form class="uk-form-stacked" @submit.prevent="overrideAPIHost">
<label class="uk-form-label">Override API origin</label>
<input v-model="currentOrigin" class="uk-input" type="text" />
<input v-model="newOrigin" class="uk-input" type="text" />
<button class="uk-button uk-button-default uk-margin-small">
Apply
</button>
@ -19,19 +19,22 @@ export default {
data: function() {
return {
currentOrigin: this.$store.state.origin
newOrigin: this.$store.state.origin
};
},
mounted() {
if (!this.$store.getters.ready) {
this.currentOrigin = "http://microscope.local:5000";
if (localStorage.overrideOrigin){
this.newOrigin = localStorage.overrideOrigin;
}else{
this.newOrigin = "http://microscope.local:5000";
}
},
methods: {
overrideAPIHost: function() {
this.$store.commit("changeOrigin", this.currentOrigin);
this.$store.commit("changeOrigin", this.newOrigin);
localStorage.overrideOrigin = this.newOrigin
}
}
};

View file

@ -160,6 +160,7 @@ export default {
stride_size: [800, 600, 10],
fast_autofocus: true,
autofocus_dz: 2000,
style: "raster",
use_video_port: false
};
},