Merge branch 'empty-cal' into 'v3'

Update camera cal instructions to look through empty area if possible

Closes #580

See merge request openflexure/openflexure-microscope-server!545

webapp/src/components/modalComponents/calibrationWizardComponents/cameraCalibrationSteps/camCalibrationExplanation.vue

@@ -1,17 +1,26 @@
 <template>
-  <div>
+  <stepTemplateWithStream>
-    <p>
+    <div>
-      <b> Before starting camera calibration: </b>
+      <p>
-    </p>
+        <b> Before starting camera calibration: </b>
-    <ul class="uk-list uk-list-bullet">
+      </p>
-      <li>Remove any samples from your microscope</li>
+      <ul class="uk-list uk-list-bullet">
-      <li>Ensure your illumination is on, well focused, and centred.</li>
+        <li>Ensure your illumination is on, well focused, and centred.</li>
-    </ul>
+        <li>Insert a slide with some empty areas.</li>
-  </div>
+        <li>If your slide has no empty areas, remove it and instead calibrate with no sample.</li>
+      </ul>
+    </div>
+  </stepTemplateWithStream>
 </template>
 
 <script>
+import stepTemplateWithStream from "../stepTemplateWithStream.vue";
 export default {
-  name: "CamCalibrationExplanation",
+  name: "CamExplanationStep",
+
+  components: {
+    stepTemplateWithStream,
+  },
 };
 </script>
+<style scoped></style>

webapp/src/components/modalComponents/calibrationWizardComponents/cameraCalibrationSteps/cameraFocusStep.vue

@@ -0,0 +1,31 @@
+<template>
+  <stepTemplateWithStream>
+    <ul>
+      <li>
+        Move your slide to an empty area, ideally looking through the coverslip if your slide has
+        one.
+      </li>
+      <li>
+        Use the buttons below or Page Up/Down to defocus slightly, to make sure no features are
+        visible.
+      </li>
+    </ul>
+    <template #below-stream>
+      <stageControlButtons :show-dpad="false" />
+    </template>
+  </stepTemplateWithStream>
+</template>
+
+<script>
+import stepTemplateWithStream from "../stepTemplateWithStream.vue";
+import stageControlButtons from "@/components/tabContentComponents/controlComponents/stageControlButtons.vue";
+export default {
+  name: "CameraFocusStep",
+
+  components: {
+    stepTemplateWithStream,
+    stageControlButtons,
+  },
+};
+</script>
+<style scoped></style>

webapp/src/components/modalComponents/calibrationWizardComponents/cameraCalibrationSteps/cameraMainCalibrationStep.vue

@@ -1,7 +1,10 @@
 <template>
   <stepTemplateWithStream>
     <p>
-      <b>Once your field of view is empty and well illuminated, click Full Auto-Calibrate.</b>
+      <b
+        >Once your field of view appears empty, and the illumination looks centred, click Full
+        Auto-Calibrate.</b
+      >
     </p>
 
     <template #below-stream>

webapp/src/components/modalComponents/calibrationWizardComponents/cameraCalibrationTask.vue

@@ -15,6 +15,7 @@ import calibrationWizardTask from "./calibrationWizardTask.vue";
 import camCalibrationExplanation from "./cameraCalibrationSteps/camCalibrationExplanation.vue";
 import cameraMainCalibrationStep from "./cameraCalibrationSteps/cameraMainCalibrationStep.vue";
 import { markRaw } from "vue";
+import CameraFocusStep from "./cameraCalibrationSteps/cameraFocusStep.vue";
 
 export default {
   name: "CameraCalibrationTask",
@@ -38,6 +39,7 @@ export default {
     return {
       steps: [
         { component: markRaw(camCalibrationExplanation) },
+        { component: markRaw(CameraFocusStep) },
         { component: markRaw(cameraMainCalibrationStep) },
       ],
     };

webapp/src/components/modalComponents/calibrationWizardComponents/csmSteps/focusStep.vue

@@ -12,7 +12,7 @@
 import stepTemplateWithStream from "../stepTemplateWithStream.vue";
 import stageControlButtons from "@/components/tabContentComponents/controlComponents/stageControlButtons.vue";
 export default {
-  name: "CameraMainCalibrationStep",
+  name: "CSMFocusStep",
 
   components: {
     stepTemplateWithStream,

webapp/src/components/modalComponents/calibrationWizardComponents/csmSteps/runCsmStep.vue

@@ -20,7 +20,7 @@ import stepTemplateWithStream from "../stepTemplateWithStream.vue";
 import CSMCalibrationSettings from "../../../tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue";
 
 export default {
-  name: "CameraMainCalibrationStep",
+  name: "CSMMainCalibrationStep",
 
   components: {
     stepTemplateWithStream,