diff --git a/webapp/public/direction_AC.png b/webapp/public/direction_AC.png new file mode 100644 index 00000000..214c0efd Binary files /dev/null and b/webapp/public/direction_AC.png differ diff --git a/webapp/public/direction_CW.png b/webapp/public/direction_CW.png new file mode 100644 index 00000000..3758dc4b Binary files /dev/null and b/webapp/public/direction_CW.png differ diff --git a/webapp/src/components/modalComponents/calibrationWizard.vue b/webapp/src/components/modalComponents/calibrationWizard.vue index 798ee8e5..0eabd2f2 100644 --- a/webapp/src/components/modalComponents/calibrationWizard.vue +++ b/webapp/src/components/modalComponents/calibrationWizard.vue @@ -126,7 +126,7 @@ export default { if (this.thingAvailable("stage") && this.thingDescription("stage").title != "DummyStage") { tasks.push({ component: markRaw(singleStepTask), - props: { stepComponent: zMotorDirectionStep }, + props: { title: "Stage Calibration", stepComponent: zMotorDirectionStep }, }); } diff --git a/webapp/src/components/modalComponents/calibrationWizardComponents/zMotorDirectionStep.vue b/webapp/src/components/modalComponents/calibrationWizardComponents/zMotorDirectionStep.vue index e04d3711..7d49049e 100644 --- a/webapp/src/components/modalComponents/calibrationWizardComponents/zMotorDirectionStep.vue +++ b/webapp/src/components/modalComponents/calibrationWizardComponents/zMotorDirectionStep.vue @@ -1,9 +1,8 @@ @@ -42,10 +63,6 @@ import ActionButton from "../../labThingsComponents/actionButton.vue"; export default { name: "ZMotorDirectionStep", - components: { - ActionButton, - }, - emits: ["advance", "awaiting-user"], data: function () { @@ -84,6 +101,12 @@ export default { selectDir() { this.$emit("advance"); }, + // If motor moves clockwise, invert z direction, then progress to next step + triggerClockwise() { + this.invokeAction("stage", "invert_axis_direction", { axis: "z" }).then(() => { + this.selectDir(); + }); + }, }, }; @@ -95,4 +118,25 @@ export default { padding: 0 30px; gap: 4px; } + +.dir-option { + display: flex; + flex-direction: column; + align-items: center; + gap: 8px; + margin: 5px; +} + +.dir-image { + width: 70%; + height: auto; +} + +.clickable { + cursor: pointer; +} + +.dir-option button { + text-align: center; +}