Add log to CSM pane of cal wizard rather than use second pop-up
This commit is contained in:
parent
6148e49282
commit
2ffd2378b9
2 changed files with 25 additions and 17 deletions
|
|
@ -5,10 +5,19 @@
|
|||
</p>
|
||||
<p>If it is not in focus, click back and re-focus.</p>
|
||||
<template #below-stream>
|
||||
<action-log-display id="log-display" :log="log" :task-status="taskStatus" />
|
||||
<div class="action-button-container">
|
||||
<CSMCalibrationSettings
|
||||
:show-extra-settings="false"
|
||||
@recalibrate-response="checkCalibrationState"
|
||||
<action-button
|
||||
:button-primary="true"
|
||||
: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>
|
||||
</template>
|
||||
|
|
@ -16,18 +25,27 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import actionButton from "@/components/labThingsComponents/actionButton.vue";
|
||||
import actionLogDisplay from "@/components/labThingsComponents/actionLogDisplay.vue";
|
||||
import stepTemplateWithStream from "../stepTemplateWithStream.vue";
|
||||
import CSMCalibrationSettings from "../../../tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue";
|
||||
|
||||
export default {
|
||||
name: "CSMMainCalibrationStep",
|
||||
|
||||
components: {
|
||||
actionButton,
|
||||
actionLogDisplay,
|
||||
stepTemplateWithStream,
|
||||
CSMCalibrationSettings,
|
||||
},
|
||||
|
||||
emits: ["awaiting-user"],
|
||||
emits: ["prevent-navigation", "awaiting-user"],
|
||||
|
||||
data: function () {
|
||||
return {
|
||||
log: [],
|
||||
taskStatus: "",
|
||||
};
|
||||
},
|
||||
|
||||
mounted() {
|
||||
this.checkCalibrationState();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue