Merge branch 'navigate_to_control' into 'v3'

Changed navigate tab to control tab

Closes #469

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

webapp/src/App.vue

@@ -262,7 +262,7 @@ export default {
         event.target.classList.contains("scrollTarget")
       ) {
         var z_rel = event.deltaY / 100;
-        // Emit a signal to move, acted on by panelNavigate.vue
+        // Emit a signal to move, acted on by panelControl.vue
         this.$root.$emit("globalMoveStepEvent", 0, 0, z_rel, false);
       }
     },
@@ -289,7 +289,7 @@ export default {
         y_rel = y_rel - 1;
       }
       // Make a position request
-      // Emit a signal to move, acted on by panelNavigate.vue
+      // Emit a signal to move, acted on by panelControl.vue
       this.$root.$emit("globalMoveStepEvent", x_rel, y_rel, z_rel);
     }
   }

webapp/src/components/appContent.vue

@@ -102,7 +102,7 @@ import tabIcon from "./genericComponents/tabIcon";
 import tabContent from "./genericComponents/tabContent";
 
 // Import new content components
-import navigateContent from "./tabContentComponents/navigateContent.vue";
+import controlContent from "./tabContentComponents/controlContent.vue";
 import slideScanContent from "./tabContentComponents/slideScanContent.vue";
 import backgroundDetectContent from "./tabContentComponents/backgroundDetectContent.vue";
 import viewContent from "./tabContentComponents/viewContent.vue";
@@ -123,7 +123,7 @@ export default {
   components: {
     tabIcon,
     tabContent,
-    navigateContent,
+    controlContent,
     slideScanContent,
     viewContent,
     settingsContent,
@@ -182,9 +182,9 @@ export default {
           component: viewContent
         },
         {
-          id: "navigate",
+          id: "control",
           icon: "gamepad",
-          component: navigateContent
+          component: controlContent
         },
         {
           id: "background detect",

webapp/src/components/tabContentComponents/controlComponents/paneControl.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="paneNavigate" class="uk-padding-small">
+  <div id="paneControl" class="uk-padding-small">
     <div v-if="setPosition">
       <ul uk-accordion="multiple: true">
         <li>
@@ -180,7 +180,7 @@ import ActionButton from "../../labThingsComponents/actionButton.vue";
 
 // Export main app
 export default {
-  name: "PaneNavigate",
+  name: "PaneControl",
 
   components: {
     ActionButton

webapp/src/components/tabContentComponents/controlContent.vue

@@ -2,7 +2,7 @@
   <!-- Grid managing tab content -->
   <div uk-grid class="uk-height-1-1 uk-margin-remove uk-padding-remove">
     <div class="control-component">
-      <paneNavigate />
+      <paneControl />
     </div>
     <div class="view-component uk-width-expand">
       <streamDisplay />
@@ -11,14 +11,14 @@
 </template>
 
 <script>
-import paneNavigate from "./navigateComponents/paneNavigate";
+import paneControl from "./controlComponents/paneControl";
 import streamDisplay from "./streamContent.vue";
 
 export default {
-  name: "NavigateContent",
+  name: "ControlContent",
 
   components: {
-    paneNavigate,
+    paneControl,
     streamDisplay
   }
 };

webapp/src/components/tabContentComponents/streamContent.vue

@@ -125,7 +125,7 @@ export default {
       let xRelative = (0.5 * event.target.offsetWidth - xCoordinate) * scale;
       let yRelative = (0.5 * event.target.offsetHeight - yCoordinate) * scale;
 
-      // Emit a signal to move, acted on by panelNavigate.vue
+      // Emit a signal to move, acted on by paneControl.vue
       this.$root.$emit(
         "globalMoveInImageCoordinatesEvent",
         -xRelative,