Added controls for smart stack

This commit is contained in:
Richard 2021-07-25 09:14:33 +01:00
parent 5b63745ad0
commit 3cdfd52a77

View file

@ -244,10 +244,70 @@
</div>
</div>
</li>
<!--Show stack and scan if scan plugin is enabled-->
<li v-if="scanUri" :class="{ 'uk-open': smartStack && scanCapture }">
<a class="uk-accordion-title" href="#">Smart Stack</a>
<div
class="uk-accordion-content"
:class="{ 'uk-disabled': !scanCapture }"
>
<div class="uk-margin">
<label
><input
v-model="smartStack"
class="uk-checkbox"
type="checkbox"
/>
Enable smart stacking</label
>
</div>
<p>
Smart stacking is an experimental closed-loop Z stack, that checks
the Z stack is centred on the focus. It requires Z stacking to be
enabled above (we recommend 9 images in Z) and you must select
"fast" autofocus.
</p>
<div :class="{ 'uk-disabled': !smartStack }">
<div class="uk-margin-small uk-margin-remove-bottom">
<label class="uk-form-label" for="form-stacked-text"
>Autofocus range (steps)</label
>
<input
v-model="smartStackAutofocusDz"
class="uk-input uk-form-small"
type="number"
min="1000"
/>
</div>
<div class="uk-margin-small uk-margin-remove-bottom">
<label class="uk-form-label" for="form-stacked-text"
>Alignment range (steps)</label
>
<input
v-model="smartStackAlignDist"
class="uk-input uk-form-small"
type="number"
min="100"
/>
</div>
</div>
</div>
</li>
</ul>
<div v-if="scanCapture" class="uk-margin uk-margin-remove-top">
<taskSubmitter
v-if="smartStack"
:submit-url="smartScanUri"
:submit-data="smartScanPayload"
:submit-label="'Start Smart Scan'"
:button-primary="true"
@response="onScanResponse"
@error="modalError"
>
</taskSubmitter>
<taskSubmitter
v-if="!smartStack"
:submit-url="scanUri"
:submit-data="scanPayload"
:submit-label="'Start Scan'"
@ -305,7 +365,14 @@ function defaultCaptureSettings() {
annotations: {
Client: "openflexure-microscope-jsclient:builtin"
},
scanUri: null
smartStack: false,
smartStackThreshold: 0.9,
smartStackPeakWidth: 200,
smartStackAlignDist: 900,
smartStackBacklash: 100,
smartStackFitStyle: "chevy",
smartStackMAndMIndex: 10,
smartStackAutofocusDz: 3000
};
}
@ -322,7 +389,9 @@ export default {
data: function() {
return {
...defaultCaptureSettings(),
scanCapture: false // Don't remember the "scan" tickbox in local storage.
scanCapture: false, // Don't remember the "scan" tickbox in local storage.
scanUri: null,
smartScanUri: null
};
},
@ -372,7 +441,7 @@ export default {
},
scanPayload: function() {
var payload = this.basePayload;
var payload = Object.assign({}, this.basePayload);
// Scan params
payload.grid = [this.scanSteps.x, this.scanSteps.y, this.scanSteps.z];
@ -396,6 +465,17 @@ export default {
payload.autofocus_dz = afDeltas[this.scanDeltaZ];
payload.fast_autofocus = this.scanDeltaZ == "Fast";
return payload;
},
smartScanPayload: function() {
var payload = Object.assign({}, this.scanPayload);
payload.threshold = this.smartStackThreshold;
payload.width = this.smartStackPeakWidth;
payload.align_dist = this.smartStackAlignDist;
payload.backlash = this.smartStackBacklash;
payload.fit_style = this.smartStackFitStyle;
payload.m_and_m_index = this.smartStackMAndMIndex;
payload.autofocus_dz = this.smartStackAutofocusDz;
return payload;
}
},
@ -446,6 +526,22 @@ export default {
.catch(error => {
this.modalError(error); // Let mixin handle error
});
axios
.get(this.pluginsUri) // Get a list of plugins
.then(response => {
var plugins = response.data;
var foundExtension = plugins.find(
e => e.title === "org.openflexure.smart-stack"
);
if (foundExtension) {
// Get plugin action link
this.smartScanUri = foundExtension.links.tile.href;
}
})
.catch(error => {
this.modalError(error); // Let mixin handle error
});
},
onScanResponse: function() {