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

Add log to CSM pane of cal wizard rather than use second pop-up

Browse source
This commit is contained in:
Julian Stirling 2026-06-30 11:25:56 +01:00
parent 6148e49282
commit 2ffd2378b9
2 changed files with 25 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

30
webapp/src/components/modalComponents/calibrationWizardComponents/csmSteps/runCsmStep.vue
View file

@ -5,10 +5,19 @@
</p> </p>
<p>If it is not in focus, click back and re-focus.</p> <p>If it is not in focus, click back and re-focus.</p>
<template #below-stream> <template #below-stream>
<action-log-display id="log-display" :log="log" :task-status="taskStatus" />
<div class="action-button-container"> <div class="action-button-container">
<CSMCalibrationSettings <action-button
:show-extra-settings="false" :button-primary="true"
@recalibrate-response="checkCalibrationState" :can-terminate="true"
thing="camera_stage_mapping"
action="calibrate_xy"
:submit-label="'Auto-Calibrate Using Camera'"
@error="modalError"
@update:task-status="taskStatus = $event"
@update:log="log = $event"
@task-started="$emit('prevent-navigation', true)"
@finished="$emit('prevent-navigation', false)"
/> />
</div> </div>
</template> </template>
@ -16,18 +25,27 @@
</template> </template>
<script> <script>
import actionButton from "@/components/labThingsComponents/actionButton.vue";
import actionLogDisplay from "@/components/labThingsComponents/actionLogDisplay.vue";
import stepTemplateWithStream from "../stepTemplateWithStream.vue"; import stepTemplateWithStream from "../stepTemplateWithStream.vue";
import CSMCalibrationSettings from "../../../tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue";
export default { export default {
name: "CSMMainCalibrationStep", name: "CSMMainCalibrationStep",
components: { components: {
actionButton,
actionLogDisplay,
stepTemplateWithStream, stepTemplateWithStream,
CSMCalibrationSettings,
}, },
emits: ["awaiting-user"], emits: ["prevent-navigation", "awaiting-user"],
data: function () {
return {
log: [],
taskStatus: "",
};
},
mounted() { mounted() {
this.checkCalibrationState(); this.checkCalibrationState();

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

@ -1,7 +1,7 @@
<template> <template>
<div id="CSMCalibrationSettings" ref="CSMCalibrationSettingsContainer" class="uk-width-large"> <div id="CSMCalibrationSettings" ref="CSMCalibrationSettingsContainer" class="uk-width-large">
<!--Show auto calibrate if default plugin is enabled--> <!--Show auto calibrate if default plugin is enabled-->
<div v-if="'calibrate_xy' in actions" class="uk-margin-small"> <div class="uk-margin-small">
<action-button <action-button
:button-primary="true" :button-primary="true"
:can-terminate="true" :can-terminate="true"
@ -17,7 +17,6 @@
/> />
</div> </div>
<button <button
v-if="'last_calibration' in properties"
v-show="showExtraSettings" v-show="showExtraSettings"
type="button" type="button"
class="uk-button uk-button-default uk-width-1-1" class="uk-button uk-button-default uk-width-1-1"
@ -88,15 +87,6 @@ export default {
}; };
}, },
computed: {
actions() {
return this.thingDescription("camera_stage_mapping").actions;
},
properties() {
return this.thingDescription("camera_stage_mapping").properties;
},
},
mounted() { mounted() {
useIntersectionObserver( useIntersectionObserver(
this.$refs.CSMCalibrationSettingsContainer, this.$refs.CSMCalibrationSettingsContainer,