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

Fast autofocus in scanning

See merge request openflexure/openflexure-microscope-jsclient!6
This commit is contained in:
Joel Collins 2019-04-09 06:14:32 +00:00
commit b34a27cca9

View file

@ -149,6 +149,7 @@
<option>Coarse</option> <option>Coarse</option>
<option>Medium</option> <option>Medium</option>
<option>Fine</option> <option>Fine</option>
<option>Fast</option>
</select> </select>
</div> </div>
@ -260,10 +261,12 @@ export default {
Off: 0, Off: 0,
Coarse: 100, Coarse: 100,
Medium: 30, Medium: 30,
Fine: 10 Fine: 10,
Fast: 1500
} }
payload.autofocus_dz = afDeltas[this.scanDeltaZ] payload.autofocus_dz = afDeltas[this.scanDeltaZ]
payload.fast_autofocus = this.scanDeltaZ == "Fast"
// Do capture // Do capture
this.newScanRequest(payload) this.newScanRequest(payload)
@ -283,9 +286,9 @@ export default {
newScanRequest: function(params) { newScanRequest: function(params) {
axios.post(this.scanApiUri, params) axios.post(this.scanApiUri, params)
.then(response => { .then(response => {
console.log("Task ID: " + response.data[0].id) console.log("Task ID: " + response.data.id)
this.isScanning = true this.isScanning = true
return this.$store.dispatch('pollTask', [response.data[0].id, 3600, 5]) return this.$store.dispatch('pollTask', [response.data.id, 3600, 5])
}) })
.then(() => { .then(() => {
UIkit.notification({message: "Finished scan.", status: 'success'}) UIkit.notification({message: "Finished scan.", status: 'success'})