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

Merge branch 'skip-vs-next-in-cal' into 'v3'

Browse source 
Skip buttons on calibration wizard

Closes #403

See merge request openflexure/openflexure-microscope-server!433
This commit is contained in:
Julian Stirling 2025-11-10 12:26:39 +00:00
commit 5fd16bd113
6 changed files with 84 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

36
webapp/src/components/tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue
View file

@ -104,24 +104,30 @@ export default {
"camera_stage_mapping",
"image_to_stage_displacement_matrix",
);
this.csmResolution = await this.readThingProperty("camera_stage_mapping", "image_resolution");
let streamResolution = await this.readThingProperty("camera", "stream_resolution");
csmMatrix[0][0] = Number(csmMatrix[0][0].toFixed(3));
csmMatrix[0][1] = Number(csmMatrix[0][1].toFixed(3));
csmMatrix[1][0] = Number(csmMatrix[1][0].toFixed(3));
csmMatrix[1][1] = Number(csmMatrix[1][1].toFixed(3));
this.csmMatrix = csmMatrix;
this.csmRatio = Number((Math.abs(csmMatrix[1][0]) + Math.abs(csmMatrix[0][1])) / 2).toFixed(
3,
);
this.csmFOV = [
Number(((streamResolution[0] ** 2 * this.csmRatio) / this.csmResolution[1]).toFixed(0)),
Number(((streamResolution[1] ** 2 * this.csmRatio) / this.csmResolution[0]).toFixed(0)),
];
if (csmMatrix) {
this.csmResolution = await this.readThingProperty(
"camera_stage_mapping",
"image_resolution",
);
csmMatrix[0][0] = Number(csmMatrix[0][0].toFixed(3));
csmMatrix[0][1] = Number(csmMatrix[0][1].toFixed(3));
csmMatrix[1][0] = Number(csmMatrix[1][0].toFixed(3));
csmMatrix[1][1] = Number(csmMatrix[1][1].toFixed(3));
this.csmMatrix = csmMatrix;
this.csmRatio = Number((Math.abs(csmMatrix[1][0]) + Math.abs(csmMatrix[0][1])) / 2).toFixed(
3,
);
// Note [1] then [0] as CSM reports resolution as (y, x)
this.csmFOV = [
Number((this.csmResolution[1] * this.csmRatio).toFixed(0)),
Number((this.csmResolution[0] * this.csmRatio).toFixed(0)),
];
}
},
onRecalibrateResponse: function () {
onRecalibrateResponse: function (response) {
this.modalNotify("Finished stage-to-camera calibration.");
this.updateDisplayedCSM();
this.$emit("recalibrateResponse", response);
},
},
};

4
webapp/src/components/tabContentComponents/settingsComponents/cameraSettingsComponents/cameraCalibrationSettings.vue
View file

@ -6,7 +6,7 @@
:key="'primary_cal' + index"
class="uk-child-width-expand"
>
<server-specified-action-button :action-data="action" />
<server-specified-action-button :action-data="action" @finished="$emit('actionFinished')" />
</div>
<div v-if="showExtraSettings">
<div
@ -14,7 +14,7 @@
:key="'secondary_cal' + index"
class="uk-child-width-expand"
>
<server-specified-action-button :action-data="action" />
<server-specified-action-button :action-data="action" @finished="$emit('actionFinished')" />
</div>
</div>
</div>