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

Use neater spread operator to copy objects

Browse source 
Rather than Object.assign, I now use the ... operator to
ensure that dictionaries don't pollute each other in computed
properties.
This commit is contained in:
Richard 2021-08-09 21:57:52 +01:00
parent 332ecad19b
commit b7c15886e9
1 changed files with 24 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

50
openflexure_microscope/api/static/src/components/tabContentComponents/captureComponents/paneCapture.vue
View file

@ -441,18 +441,6 @@ export default {
},
scanPayload: function() {
var payload = Object.assign({}, this.basePayload);
// Scan params
payload.grid = [this.scanSteps.x, this.scanSteps.y, this.scanSteps.z];
payload.stride_size = [
this.scanStepSize.x,
this.scanStepSize.y,
this.scanStepSize.z
];
payload.style = this.scanStyle.toLowerCase();
payload.namemode = this.namingStyle.toLowerCase();
// Convert AF selector to dz
var afDeltas = {
Off: 0,
@ -461,22 +449,32 @@ export default {
Fine: 10,
Fast: 2000
};
payload.autofocus_dz = afDeltas[this.scanDeltaZ];
payload.fast_autofocus = this.scanDeltaZ == "Fast";
return payload;
return {
...this.basePayload,
// Scan params
grid: [this.scanSteps.x, this.scanSteps.y, this.scanSteps.z],
stride_size: [
this.scanStepSize.x,
this.scanStepSize.y,
this.scanStepSize.z
],
style: this.scanStyle.toLowerCase(),
namemode: this.namingStyle.toLowerCase(),
autofocus_dz: afDeltas[this.scanDeltaZ],
fast_autofocus: this.scanDeltaZ == "Fast"
};
},
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;
return {
...this.scanPayload,
threshold: this.smartStackThreshold,
width: this.smartStackPeakWidth,
align_dist: this.smartStackAlignDist,
backlash: this.smartStackBacklash,
fit_style: this.smartStackFitStyle,
m_and_m_index: this.smartStackMAndMIndex,
autofocus_dz: this.smartStackAutofocusDz
};
}
},