Rename calibrationModal to calibrationWizard to avoid confusion with the internal modal element

webapp/src/components/appContent.vue

@@ -5,10 +5,10 @@
     uk-grid
   >
     <!-- Initialisation modals -->
-    <calibrationModal
+    <calibrationWizard
-      ref="calibrationModal"
+      ref="calibrationWizard"
       @onClose="enterApp()"
-    ></calibrationModal>
+    ></calibrationWizard>
     <!-- Vertical tab bar -->
     <div id="switcher-left-container">
       <div
@@ -112,7 +112,7 @@ import loggingContent from "./tabContentComponents/loggingContent.vue";
 import powerContent from "./tabContentComponents/powerContent.vue";
 
 // Import modal components for device initialisation
-import calibrationModal from "./modalComponents/calibrationModal.vue";
+import calibrationWizard from "./modalComponents/calibrationWizard.vue";
 import TabIcon from "./genericComponents/tabIcon.vue";
 import ScanListContent from "./tabContentComponents/scanListContent.vue";
 
@@ -127,7 +127,7 @@ export default {
     slideScanContent,
     viewContent,
     settingsContent,
-    calibrationModal,
+    calibrationWizard,
     aboutContent,
     loggingContent,
     TabIcon,
@@ -246,7 +246,7 @@ export default {
       this.currentTab = newId;
     },
     startModals: function() {
-      this.$refs.calibrationModal.show();
+      this.$refs.calibrationWizard.show_if_needed();
     },
     enterApp: function() {
       // Stuff to do once connected and all init modals are finished

webapp/src/components/modalComponents/calibrationWizard.vue

@@ -186,13 +186,14 @@
 </template>
 
 <script>
+
 import cameraCalibrationSettings from "../tabContentComponents/settingsComponents/cameraSettingsComponents/cameraCalibrationSettings.vue";
 import CSMCalibrationSettings from "../tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue";
 import miniStreamDisplay from "../genericComponents/miniStreamDisplay.vue";
 import ActionButton from "../labThingsComponents/actionButton.vue";
 
 export default {
-  name: "CalibrationModal",
+  name: "calibrationWizard",
 
   components: {
     cameraCalibrationSettings,
@@ -236,7 +237,7 @@ export default {
   },
 
   methods: {
-    show: async function() {
+    show_if_needed: async function() {
       // Check if the camera and stage are calibrated, if they can be
       if (this.canCSMCalibrated) {
         let csm = await this.readThingProperty(
@@ -256,9 +257,7 @@ export default {
       if (this.isUseful) {
         this.ready = true;
         this.stepValue = 0;
-        // Show the modal
+        this.show()
-        var el = this.$refs["calibrationModalEl"];
-        this.showModalElement(el); // Calls the mixin
       } else {
         // If not useful, we just return the onClose event immediately
         this.onHide();
@@ -270,9 +269,7 @@ export default {
       this.ready = true;
       this.stepValue = 1;
       this.force = true
-        // Show the modal
+      this.show()
-        var el = this.$refs["calibrationModalEl"];
-        this.showModalElement(el); // Calls the mixin
     },
 
     restart: function() {
@@ -283,6 +280,12 @@ export default {
       }
     },
 
+    show: function() {
+      // Show the modal element
+      var el = this.$refs["calibrationModalEl"];
+      this.showModalElement(el); // Calls the mixin
+    },
+
     hide: function() {
       // Show the modal
       var el = this.$refs["calibrationModalEl"];

webapp/src/components/tabContentComponents/settingsContent.vue

@@ -1,10 +1,10 @@
 <template>
   <!-- Grid managing tab content -->
   <div uk-grid class="uk-height-1-1 uk-margin-remove uk-padding-remove">
-    <calibrationModal
+    <calibrationWizard
-      ref="calibrationModal"
+      ref="calibrationWizard"
       @onClose="enterApp()"
-    ></calibrationModal>
+    ></calibrationWizard>
     <div class="settings-nav">
       <ul class="uk-nav uk-nav-default">
         <li class="uk-nav-header">Application Settings</li>
@@ -116,7 +116,7 @@
 
 <script>
 import streamSettings from "./settingsComponents/streamSettings.vue";
-import calibrationModal from "../modalComponents/calibrationModal.vue";
+import calibrationWizard from "../modalComponents/calibrationWizard.vue";
 import cameraSettings from "./settingsComponents/cameraSettings.vue";
 import appSettings from "./settingsComponents/appSettings.vue";
 import CSMSettings from "./settingsComponents/CSMSettings.vue";
@@ -137,7 +137,7 @@ export default {
     appSettings,
     tabIcon,
     tabContent,
-    calibrationModal
+    calibrationWizard
   },
 
   data: function() {
@@ -154,7 +154,7 @@ export default {
       }
     },
     startModals: function() {
-      this.$refs.calibrationModal.force_show();
+      this.$refs.calibrationWizard.force_show();
     }
   }
 };