Merge branch 'fast-autofocus' into 'master'
Changed coarse autofocus button to run fast autofocus See merge request openflexure/openflexure-microscope-jsclient!5
This commit is contained in:
commit
1783602174
1 changed files with 30 additions and 1 deletions
|
|
@ -72,7 +72,7 @@
|
||||||
<div class="uk-grid-small uk-child-width-1-3" uk-grid>
|
<div class="uk-grid-small uk-child-width-1-3" uk-grid>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<button v-on:click="runAutofocus([-200,-100,0,100,200]);" class="uk-button uk-button-default uk-form-small uk-float-right uk-width-1-1">Coarse</button>
|
<button v-on:click="runFastAutofocus(2000, 300);" class="uk-button uk-button-default uk-form-small uk-float-right uk-width-1-1">Coarse</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
|
|
@ -238,6 +238,32 @@ export default {
|
||||||
this.$store.commit('changeMoveLock', false); // Release the move lock
|
this.$store.commit('changeMoveLock', false); // Release the move lock
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
runFastAutofocus: function(dz, backlash) {
|
||||||
|
if (!this.$store.state.moveLock) {
|
||||||
|
// Lock move requests
|
||||||
|
this.$store.commit('changeMoveLock', true);
|
||||||
|
this.isAutofocusing = true
|
||||||
|
axios.post(this.fastAutofocusApiUri, {dz: dz, backlash: backlash})
|
||||||
|
.then(response => {
|
||||||
|
console.log("Autofocus Task ID: " + response.data.id)
|
||||||
|
// Start the store polling TaskId for success
|
||||||
|
return this.$store.dispatch('pollTask', [response.data.id, null, null])
|
||||||
|
})
|
||||||
|
.then(() => {
|
||||||
|
console.log("Successfully finished autofocus")
|
||||||
|
})
|
||||||
|
.catch(error => {
|
||||||
|
UIkit.notification({message: `<span uk-icon=\'icon: warning\'></span> ${error}`, status: 'danger'})
|
||||||
|
this.$store.dispatch('handleHTTPError', error); // Let store handle error
|
||||||
|
})
|
||||||
|
.finally(() => {
|
||||||
|
console.log("Cleaning up after autofocus.")
|
||||||
|
this.isAutofocusing = false;
|
||||||
|
this.$store.commit('changeMoveLock', false); // Release the move lock
|
||||||
|
})
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|
@ -254,6 +280,9 @@ export default {
|
||||||
},
|
},
|
||||||
autofocusApiUri: function () {
|
autofocusApiUri: function () {
|
||||||
return this.$store.getters.uri + "/plugin/default/autofocus/autofocus"
|
return this.$store.getters.uri + "/plugin/default/autofocus/autofocus"
|
||||||
|
},
|
||||||
|
fastAutofocusApiUri: function () {
|
||||||
|
return this.$store.getters.uri + "/plugin/default/fast_autofocus/fast_autofocus"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue