From a1f27b00911d18b501e73d9c6a357f2d076b8c66 Mon Sep 17 00:00:00 2001
From: samuelmcdermott <sjm263@cam.ac.uk>
Date: Sun, 11 Oct 2020 00:59:11 +0100
Subject: [PATCH 01/10] Move set_stage into a new function

---
 openflexure_microscope/microscope.py | 66 ++++++++++++++++++++--------
 1 file changed, 48 insertions(+), 18 deletions(-)

diff --git a/openflexure_microscope/microscope.py b/openflexure_microscope/microscope.py
index 32b75ff2..9e9e1e3f 100644
--- a/openflexure_microscope/microscope.py
+++ b/openflexure_microscope/microscope.py
@@ -105,24 +105,8 @@ class Microscope:
                     logging.warning("No compatible camera hardware found.")
 
         ### Stage
-        logging.info("Creating stage")
-        if configuration.get("stage"):
-            stage_type = configuration["stage"].get("type")
-            stage_port = configuration["stage"].get("port")
-            if stage_type in ("SangaBoard", "SangaStage"):
-                try:
-                    logging.info("Trying SangaStage")
-                    self.stage = SangaStage(port=stage_port)
-                except Exception as e:
-                    logging.error(e)
-                    logging.warning("No compatible Sangaboard hardware found.")
-            elif stage_type in ("SangaDeltaStage"):
-                try:
-                    logging.info("Trying SangaDeltaStage")
-                    self.stage = SangaDeltaStage(port=stage_port)
-                except Exception as e:
-                    logging.error(e)
-                    logging.warning("No compatible Sangaboard hardware found.")                    
+        self.set_stage(configuration=configuration)
+                 
 
         logging.info("Handling fallbacks")
         ### Fallbacks
@@ -138,6 +122,51 @@ class Microscope:
         if hasattr(self.stage, "lock"):
             self.lock.locks.append(self.stage.lock)
 
+    def set_stage(self, configuration=None, stage_type=None):
+        """
+        Set or change the stage geometry
+        """
+        if not configuration:
+            configuration = self.configuration
+
+        if stage_type:
+            if stage_type == configuration["stage"].get("type"):
+                    logging.info("Stage already set to that stage type")
+                    return
+        else:
+            stage_type = configuration["stage"].get("type")
+        
+        ### Close any existing stages
+        if self.stage:
+                stage_port = self.stage.port
+                self.stage.close()
+
+
+        logging.info("Setting stage")
+        stage_port = configuration["stage"].get("port")             
+                    
+        if stage_type in ("SangaBoard", "SangaStage"):
+            try:
+                logging.info("Trying SangaStage")
+                self.stage = SangaStage(port=stage_port)
+            except Exception as e:
+                logging.error(e)
+                logging.warning("No compatible Sangaboard hardware found.")
+        elif stage_type in ("SangaDeltaStage"):
+            try:
+                logging.info("Trying SangaDeltaStage")
+                self.stage = SangaDeltaStage(port=stage_port)
+                
+            except Exception as e:
+                logging.error(e)
+                logging.warning("No compatible Sangaboard hardware found.")
+        else:
+            logging.warning("The stage type is incorrectly defined.")   
+
+        logging.info("Saving new stage type configuration")
+        configuration["stage"]["type"] = stage_type
+        self.configuration_file.save(configuration)
+        
     def has_real_stage(self) -> bool:
         """
         Check if a real (non-mock) stage is currently attached.
@@ -363,6 +392,7 @@ class Microscope:
 
             # Capture to output object
             logging.info(f"Starting microscope capture {output.file}")
+            print(output)
             self.camera.capture(
                 output,
                 use_video_port=use_video_port,

From 79f3104409d19fed5a35529995ee82d848f6aac8 Mon Sep 17 00:00:00 2001
From: samuelmcdermott <sjm263@cam.ac.uk>
Date: Sun, 11 Oct 2020 01:01:21 +0100
Subject: [PATCH 02/10] Add API to set the stage

---
 .../api/v2/views/actions/__init__.py              |  5 +++++
 .../api/v2/views/actions/stage.py                 | 15 +++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/openflexure_microscope/api/v2/views/actions/__init__.py b/openflexure_microscope/api/v2/views/actions/__init__.py
index 1c26e31a..8a740316 100644
--- a/openflexure_microscope/api/v2/views/actions/__init__.py
+++ b/openflexure_microscope/api/v2/views/actions/__init__.py
@@ -39,6 +39,11 @@ _actions = {
         "view_class": stage.ZeroStageAPI,
         "conditions": True,
     },
+    "setStage": {
+        "rule" : "/stage/set/",
+        "view_class": stage.SetStageAPI,
+        "conditions": True,
+    },
     "shutdown": {
         "rule": "/system/shutdown/",
         "view_class": system.ShutdownAPI,
diff --git a/openflexure_microscope/api/v2/views/actions/stage.py b/openflexure_microscope/api/v2/views/actions/stage.py
index cb26823f..d037cc9c 100644
--- a/openflexure_microscope/api/v2/views/actions/stage.py
+++ b/openflexure_microscope/api/v2/views/actions/stage.py
@@ -65,3 +65,18 @@ class ZeroStageAPI(ActionView):
 
         # TODO: Make schema for microscope state
         return microscope.state["stage"]
+
+class SetStageAPI(ActionView):
+    args = {
+        "stage_type": fields.String(missing = None, example = "SangaStage", description = "The stage geometry [SangaStage, SangaDeltaStage]")
+    }
+    def post(self,args):
+        """
+        Set the stage geometry.
+        """
+        microscope = find_component("org.openflexure.microscope")
+        microscope.set_stage(stage_type=args.get("stage_type"))
+        
+        # TODO: Make schema for microscope state
+        return microscope.state["stage"]
+

From 81ca2c9cb164f457917e7fdfb37ce241b3e2b380 Mon Sep 17 00:00:00 2001
From: samuelmcdermott <sjm263@cam.ac.uk>
Date: Mon, 12 Oct 2020 01:23:44 +0100
Subject: [PATCH 03/10] Add a get route for the stage type and rename

---
 .../api/v2/views/actions/__init__.py                  |  4 ++--
 openflexure_microscope/api/v2/views/actions/stage.py  | 11 +++++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/openflexure_microscope/api/v2/views/actions/__init__.py b/openflexure_microscope/api/v2/views/actions/__init__.py
index 8a740316..9a5e08d2 100644
--- a/openflexure_microscope/api/v2/views/actions/__init__.py
+++ b/openflexure_microscope/api/v2/views/actions/__init__.py
@@ -40,8 +40,8 @@ _actions = {
         "conditions": True,
     },
     "setStage": {
-        "rule" : "/stage/set/",
-        "view_class": stage.SetStageAPI,
+        "rule" : "/stage/type/",
+        "view_class": stage.StageTypeAPI,
         "conditions": True,
     },
     "shutdown": {
diff --git a/openflexure_microscope/api/v2/views/actions/stage.py b/openflexure_microscope/api/v2/views/actions/stage.py
index d037cc9c..c805d7e9 100644
--- a/openflexure_microscope/api/v2/views/actions/stage.py
+++ b/openflexure_microscope/api/v2/views/actions/stage.py
@@ -66,7 +66,7 @@ class ZeroStageAPI(ActionView):
         # TODO: Make schema for microscope state
         return microscope.state["stage"]
 
-class SetStageAPI(ActionView):
+class StageTypeAPI(ActionView):
     args = {
         "stage_type": fields.String(missing = None, example = "SangaStage", description = "The stage geometry [SangaStage, SangaDeltaStage]")
     }
@@ -78,5 +78,12 @@ class SetStageAPI(ActionView):
         microscope.set_stage(stage_type=args.get("stage_type"))
         
         # TODO: Make schema for microscope state
-        return microscope.state["stage"]
+        return microscope.configuration["stage"]["type"]
+
+    def get(self):
+        """
+        Get the stage geometry.
+        """
+        microscope = find_component("org.openflexure.microscope")
+        return microscope.configuration["stage"]["type"]
 

From b25e7b75e04ebd769553a11e1afeb0dc97e32195 Mon Sep 17 00:00:00 2001
From: samuelmcdermott <sjm263@cam.ac.uk>
Date: Mon, 12 Oct 2020 01:28:41 +0100
Subject: [PATCH 04/10] Add Vue component for changing the stage type via API

---
 .../settingsComponents/stageSettings.vue      | 78 +++++++++++++++++++
 .../viewComponents/settingsDisplay.vue        | 26 ++++++-
 2 files changed, 103 insertions(+), 1 deletion(-)
 create mode 100644 openflexure_microscope/api/static/src/components/viewComponents/settingsComponents/stageSettings.vue

diff --git a/openflexure_microscope/api/static/src/components/viewComponents/settingsComponents/stageSettings.vue b/openflexure_microscope/api/static/src/components/viewComponents/settingsComponents/stageSettings.vue
new file mode 100644
index 00000000..9923e353
--- /dev/null
+++ b/openflexure_microscope/api/static/src/components/viewComponents/settingsComponents/stageSettings.vue
@@ -0,0 +1,78 @@
+<template>
+    <div id="stageSettings">
+        <div>
+            <h3>Stage settings</h3>
+            <p>
+                <label>
+                    Stage Type
+                    <div v-if="this.stageType != 'MissingStage'">
+                        <select v-model="stageType" class="uk-select">
+                            <option value="SangaStage">SangaStage (Standard)</option>
+                            <option value= "SangaDeltaStage"> SangaStage (Delta)</option>
+                        </select>
+                    </div>
+                    <div v-else class="uk-text-danger"><b>No stage connected</b></div>
+                </label>
+            </p>
+        </div>
+    </div>
+</template>
+
+<script>
+
+import axios from "axios";
+
+export default {
+    name: "StageSettings",
+
+    data: function(){
+        return {
+            stageType: "MissingStage",
+        }
+    },
+    
+    computed: {
+        stageTypeUri: function() {
+        return `${this.$store.getters.baseUri}/api/v2/actions/stage/type`;
+        },
+    },
+
+    mounted(){
+        this.getStageType();
+    },
+
+    watch:{
+        stageType: function(){
+            this.setStageType();
+        }
+    },
+
+    methods: {
+        getStageType: function(){
+            console.log("Getting stage type")
+            axios
+                .get(this.stageTypeUri)
+                .then(response => {
+                    console.log("Stage type is " + response.data)
+                    this.stageType = response.data;
+                })
+                .catch(error => {
+                    this.modalError(error);
+                });
+        },
+        setStageType: function(){
+            console.log("Changing stage type")
+            axios
+                .post(this.stageTypeUri,{"stage_type" : this.stageType})
+                .then(response => {
+                    console.log("Stage type changed")
+                })
+                .catch(error => {
+                    this.modalError(error);
+                });
+        }
+    }
+}
+</script>
+
+<style lang="less"></style>
diff --git a/openflexure_microscope/api/static/src/components/viewComponents/settingsDisplay.vue b/openflexure_microscope/api/static/src/components/viewComponents/settingsDisplay.vue
index 60cd1e0a..4db2a467 100644
--- a/openflexure_microscope/api/static/src/components/viewComponents/settingsDisplay.vue
+++ b/openflexure_microscope/api/static/src/components/viewComponents/settingsDisplay.vue
@@ -44,6 +44,19 @@
             Camera
           </tabIcon>
         </li>
+        <li>
+          <tabIcon
+            id="settings-stage-icon"
+            tab-i-d="stage"
+            :show-title="false"
+            :show-tooltip="false"
+            :require-connection="true"
+            :current-tab="currentTab"
+            @set-tab="setTab"
+          >
+            Stage
+          </tabIcon>
+        </li>
         <li>
           <tabIcon
             id="settings-mapping-icon"
@@ -104,6 +117,16 @@
         </div>
       </tabContent>
 
+      <tabContent
+        tab-i-d="stage"
+        :require-connection="true"
+        :current-tab="currentTab"
+      >
+        <div class="settings-pane uk-padding-small">
+          <stageSettings />
+        </div>
+      </tabContent>
+
       <tabContent
         tab-i-d="mapping"
         :require-connection="true"
@@ -141,7 +164,7 @@ import cameraSettings from "./settingsComponents/cameraSettings.vue";
 import appSettings from "./settingsComponents/appSettings.vue";
 import featuresSettings from "./settingsComponents/featuresSettings.vue";
 import cameraStageMappingSettings from "./settingsComponents/cameraStageMappingSettings.vue";
-
+import stageSettings from "./settingsComponents/stageSettings.vue";
 // Import generic components
 import tabIcon from "../genericComponents/tabIcon";
 import tabContent from "../genericComponents/tabContent";
@@ -153,6 +176,7 @@ export default {
   components: {
     streamSettings,
     cameraSettings,
+    stageSettings,
     microscopeSettings,
     cameraStageMappingSettings,
     appSettings,

From f30679d4db36505cb8a82c331aff333b9767814a Mon Sep 17 00:00:00 2001
From: samuelmcdermott <sjm263@cam.ac.uk>
Date: Mon, 12 Oct 2020 16:56:25 +0100
Subject: [PATCH 05/10] stage API returns a dict

---
 openflexure_microscope/api/v2/views/actions/stage.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/openflexure_microscope/api/v2/views/actions/stage.py b/openflexure_microscope/api/v2/views/actions/stage.py
index c805d7e9..525a1d5b 100644
--- a/openflexure_microscope/api/v2/views/actions/stage.py
+++ b/openflexure_microscope/api/v2/views/actions/stage.py
@@ -76,14 +76,12 @@ class StageTypeAPI(ActionView):
         """
         microscope = find_component("org.openflexure.microscope")
         microscope.set_stage(stage_type=args.get("stage_type"))
-        
-        # TODO: Make schema for microscope state
-        return microscope.configuration["stage"]["type"]
+        return {"stage_type": microscope.configuration["stage"]["type"]}
 
     def get(self):
         """
         Get the stage geometry.
         """
         microscope = find_component("org.openflexure.microscope")
-        return microscope.configuration["stage"]["type"]
+        return {"stage_type": microscope.configuration["stage"]["type"]}
 

From e886e9db28cd7c194695056ab6ea7363b0643761 Mon Sep 17 00:00:00 2001
From: samuelmcdermott <sjm263@cam.ac.uk>
Date: Mon, 12 Oct 2020 16:56:58 +0100
Subject: [PATCH 06/10] change vue to use a task submitter for setting stage

---
 .../settingsComponents/stageSettings.vue      | 55 +++++++++++--------
 1 file changed, 33 insertions(+), 22 deletions(-)

diff --git a/openflexure_microscope/api/static/src/components/viewComponents/settingsComponents/stageSettings.vue b/openflexure_microscope/api/static/src/components/viewComponents/settingsComponents/stageSettings.vue
index 9923e353..4556a316 100644
--- a/openflexure_microscope/api/static/src/components/viewComponents/settingsComponents/stageSettings.vue
+++ b/openflexure_microscope/api/static/src/components/viewComponents/settingsComponents/stageSettings.vue
@@ -6,10 +6,24 @@
                 <label>
                     Stage Type
                     <div v-if="this.stageType != 'MissingStage'">
-                        <select v-model="stageType" class="uk-select">
-                            <option value="SangaStage">SangaStage (Standard)</option>
-                            <option value= "SangaDeltaStage"> SangaStage (Delta)</option>
-                        </select>
+                        <form>
+                            <div>
+                                <select v-model="stageType" class="uk-select">
+                                    <option value="SangaStage">SangaStage (Standard)</option>
+                                    <option value= "SangaDeltaStage"> SangaStage (Delta)</option>
+                                </select>
+                            </div>
+                            <div>
+                                <taskSubmitter
+                                    :can-terminate="false"
+                                    :submit-url= "this.stageTypeUri"
+                                    :submit-data="{'stage_type' : this.stageType}"
+                                    :submit-label="'Change stage type'"
+                                    @response="onStageTypeResponse"
+                                    @error="onStageTypeError"
+                                >
+                            </div>
+                        </form>   
                     </div>
                     <div v-else class="uk-text-danger"><b>No stage connected</b></div>
                 </label>
@@ -21,10 +35,15 @@
 <script>
 
 import axios from "axios";
+import taskSubmitter from "../../genericComponents/taskSubmitter";
 
 export default {
     name: "StageSettings",
 
+    components:{
+        taskSubmitter
+    },
+
     data: function(){
         return {
             stageType: "MissingStage",
@@ -41,35 +60,27 @@ export default {
         this.getStageType();
     },
 
-    watch:{
-        stageType: function(){
-            this.setStageType();
-        }
-    },
-
     methods: {
         getStageType: function(){
             console.log("Getting stage type")
             axios
                 .get(this.stageTypeUri)
                 .then(response => {
-                    console.log("Stage type is " + response.data)
-                    this.stageType = response.data;
+                    console.log("Stage type is " + response.data.stage_type)
+                    this.stageType = response.data.stage_type;
                 })
                 .catch(error => {
                     this.modalError(error);
                 });
         },
-        setStageType: function(){
-            console.log("Changing stage type")
-            axios
-                .post(this.stageTypeUri,{"stage_type" : this.stageType})
-                .then(response => {
-                    console.log("Stage type changed")
-                })
-                .catch(error => {
-                    this.modalError(error);
-                });
+        onStageTypeResponse: function(response) {
+            this.modalNotify("Stage type changed.");
+            console.log("Stage type changed to " + response.output.stage_type)
+            this.stageType = response.output.stage_type
+        },
+
+        onStageTypeError: function(error) {
+        this.modalError(error); // Let mixin handle error
         }
     }
 }

From 86d866c5f9e3361465719f6402ef00a625249f8c Mon Sep 17 00:00:00 2001
From: samuelmcdermott <sjm263@cam.ac.uk>
Date: Tue, 13 Oct 2020 12:39:17 +0100
Subject: [PATCH 07/10] Moved API from action to property view

---
 openflexure_microscope/api/app.py             |  3 +++
 .../api/v2/views/__init__.py                  |  1 +
 .../api/v2/views/actions/__init__.py          |  5 ----
 .../api/v2/views/actions/stage.py             | 18 -------------
 openflexure_microscope/api/v2/views/stage.py  | 26 +++++++++++++++++++
 5 files changed, 30 insertions(+), 23 deletions(-)
 create mode 100644 openflexure_microscope/api/v2/views/stage.py

diff --git a/openflexure_microscope/api/app.py b/openflexure_microscope/api/app.py
index 7e77a757..5861804f 100644
--- a/openflexure_microscope/api/app.py
+++ b/openflexure_microscope/api/app.py
@@ -129,6 +129,9 @@ labthing.add_view(
 )
 labthing.add_root_link(views.ConfigurationProperty, "instrumentConfiguration")
 
+# Attach stage resources
+labthing.add_view(views.StageTypeProperty, "/properties/stage/type")
+
 
 # Attach streams resources
 labthing.add_view(views.MjpegStream, f"/streams/mjpeg")
diff --git a/openflexure_microscope/api/v2/views/__init__.py b/openflexure_microscope/api/v2/views/__init__.py
index 3c1fae87..ebfae436 100644
--- a/openflexure_microscope/api/v2/views/__init__.py
+++ b/openflexure_microscope/api/v2/views/__init__.py
@@ -2,3 +2,4 @@ from .actions import enabled_root_actions
 from .captures import *
 from .instrument import *
 from .streams import *
+from .stage import *
diff --git a/openflexure_microscope/api/v2/views/actions/__init__.py b/openflexure_microscope/api/v2/views/actions/__init__.py
index 9a5e08d2..1c26e31a 100644
--- a/openflexure_microscope/api/v2/views/actions/__init__.py
+++ b/openflexure_microscope/api/v2/views/actions/__init__.py
@@ -39,11 +39,6 @@ _actions = {
         "view_class": stage.ZeroStageAPI,
         "conditions": True,
     },
-    "setStage": {
-        "rule" : "/stage/type/",
-        "view_class": stage.StageTypeAPI,
-        "conditions": True,
-    },
     "shutdown": {
         "rule": "/system/shutdown/",
         "view_class": system.ShutdownAPI,
diff --git a/openflexure_microscope/api/v2/views/actions/stage.py b/openflexure_microscope/api/v2/views/actions/stage.py
index 525a1d5b..af7f3c6d 100644
--- a/openflexure_microscope/api/v2/views/actions/stage.py
+++ b/openflexure_microscope/api/v2/views/actions/stage.py
@@ -66,22 +66,4 @@ class ZeroStageAPI(ActionView):
         # TODO: Make schema for microscope state
         return microscope.state["stage"]
 
-class StageTypeAPI(ActionView):
-    args = {
-        "stage_type": fields.String(missing = None, example = "SangaStage", description = "The stage geometry [SangaStage, SangaDeltaStage]")
-    }
-    def post(self,args):
-        """
-        Set the stage geometry.
-        """
-        microscope = find_component("org.openflexure.microscope")
-        microscope.set_stage(stage_type=args.get("stage_type"))
-        return {"stage_type": microscope.configuration["stage"]["type"]}
-
-    def get(self):
-        """
-        Get the stage geometry.
-        """
-        microscope = find_component("org.openflexure.microscope")
-        return {"stage_type": microscope.configuration["stage"]["type"]}
 
diff --git a/openflexure_microscope/api/v2/views/stage.py b/openflexure_microscope/api/v2/views/stage.py
new file mode 100644
index 00000000..3ecd7ddd
--- /dev/null
+++ b/openflexure_microscope/api/v2/views/stage.py
@@ -0,0 +1,26 @@
+from labthings import find_component, fields, schema
+from labthings.views import PropertyView
+
+import logging
+
+
+class StageTypeProperty(PropertyView):
+    """The type of the stage"""
+
+    def get(self):
+        """
+        Get the stage geometry.
+        """
+        microscope = find_component("org.openflexure.microscope")
+        return microscope.configuration['stage']['type']
+    
+    schema = fields.String(missing=None, example="SangaStage", description="The stage geometry [SangaStage, SangaDeltaStage]")
+    
+    def put(self,stage_type):
+        """
+        Set the stage geometry.
+        """
+        microscope = find_component("org.openflexure.microscope")
+        microscope.set_stage(stage_type=stage_type)
+        return microscope.configuration["stage"]["type"]
+

From abfbf6ae20c1183d0d5dc9fae414fa6c6712e8d4 Mon Sep 17 00:00:00 2001
From: samuelmcdermott <sjm263@cam.ac.uk>
Date: Tue, 13 Oct 2020 12:39:42 +0100
Subject: [PATCH 08/10] updated for new API view

---
 .../settingsComponents/stageSettings.vue      | 39 +++++++++----------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/openflexure_microscope/api/static/src/components/viewComponents/settingsComponents/stageSettings.vue b/openflexure_microscope/api/static/src/components/viewComponents/settingsComponents/stageSettings.vue
index 4556a316..faebfd5b 100644
--- a/openflexure_microscope/api/static/src/components/viewComponents/settingsComponents/stageSettings.vue
+++ b/openflexure_microscope/api/static/src/components/viewComponents/settingsComponents/stageSettings.vue
@@ -6,7 +6,7 @@
                 <label>
                     Stage Type
                     <div v-if="this.stageType != 'MissingStage'">
-                        <form>
+                        <form @submit.prevent="setStageType">
                             <div>
                                 <select v-model="stageType" class="uk-select">
                                     <option value="SangaStage">SangaStage (Standard)</option>
@@ -14,14 +14,9 @@
                                 </select>
                             </div>
                             <div>
-                                <taskSubmitter
-                                    :can-terminate="false"
-                                    :submit-url= "this.stageTypeUri"
-                                    :submit-data="{'stage_type' : this.stageType}"
-                                    :submit-label="'Change stage type'"
-                                    @response="onStageTypeResponse"
-                                    @error="onStageTypeError"
-                                >
+                            <button type="submit" class="uk-button uk-button-primary uk-form-small uk-float-right uk-margin-small uk-width-1-1">
+                                Change stage type
+                            </button>
                             </div>
                         </form>   
                     </div>
@@ -52,7 +47,7 @@ export default {
     
     computed: {
         stageTypeUri: function() {
-        return `${this.$store.getters.baseUri}/api/v2/actions/stage/type`;
+        return `${this.$store.getters.baseUri}/api/v2/properties/stage/type`;
         },
     },
 
@@ -66,21 +61,25 @@ export default {
             axios
                 .get(this.stageTypeUri)
                 .then(response => {
-                    console.log("Stage type is " + response.data.stage_type)
-                    this.stageType = response.data.stage_type;
+                    console.log("Stage type is  "+ response.data);
+                    this.stageType = response.data;
                 })
                 .catch(error => {
                     this.modalError(error);
                 });
         },
-        onStageTypeResponse: function(response) {
-            this.modalNotify("Stage type changed.");
-            console.log("Stage type changed to " + response.output.stage_type)
-            this.stageType = response.output.stage_type
-        },
-
-        onStageTypeError: function(error) {
-        this.modalError(error); // Let mixin handle error
+        setStageType: function(){
+            console.log("Setting stage type")
+            axios
+                .put(this.stageTypeUri,this.stageType)
+                .then(response => {
+                    this.stageType = response.data;
+                    console.log("Stage type set to " + this.stageType);
+                    this.modalNotify("Stage type changed.");
+                })
+                .catch(error => {
+                    this.modalError(error);
+                });
         }
     }
 }

From ba9c77d5c3b9e3fd2f810981e227a6b57f1488fc Mon Sep 17 00:00:00 2001
From: Joel Collins <2579603-jtc42@users.noreply.gitlab.com>
Date: Tue, 13 Oct 2020 13:34:29 +0000
Subject: [PATCH 09/10] Changed stage type URL to /instrument/stage/type for
 consistency

---
 openflexure_microscope/api/app.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openflexure_microscope/api/app.py b/openflexure_microscope/api/app.py
index 5861804f..73876ce6 100644
--- a/openflexure_microscope/api/app.py
+++ b/openflexure_microscope/api/app.py
@@ -130,7 +130,7 @@ labthing.add_view(
 labthing.add_root_link(views.ConfigurationProperty, "instrumentConfiguration")
 
 # Attach stage resources
-labthing.add_view(views.StageTypeProperty, "/properties/stage/type")
+labthing.add_view(views.StageTypeProperty, "/instrument/stage/type")
 
 
 # Attach streams resources

From 4521913f1b0b523dc3783518b8c6f06bc34c936a Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Tue, 13 Oct 2020 14:59:59 +0100
Subject: [PATCH 10/10] Added OneOf to stage type schema

---
 openflexure_microscope/api/v2/views/stage.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/openflexure_microscope/api/v2/views/stage.py b/openflexure_microscope/api/v2/views/stage.py
index 3ecd7ddd..cb0c8d06 100644
--- a/openflexure_microscope/api/v2/views/stage.py
+++ b/openflexure_microscope/api/v2/views/stage.py
@@ -7,20 +7,24 @@ import logging
 class StageTypeProperty(PropertyView):
     """The type of the stage"""
 
+    schema = fields.String(
+        missing=None,
+        example="SangaStage",
+        OneOf=["SangaStage", "SangaDeltaStage"],
+        description="The translation stage geometry",
+    )
+
     def get(self):
         """
         Get the stage geometry.
         """
         microscope = find_component("org.openflexure.microscope")
-        return microscope.configuration['stage']['type']
-    
-    schema = fields.String(missing=None, example="SangaStage", description="The stage geometry [SangaStage, SangaDeltaStage]")
-    
-    def put(self,stage_type):
+        return microscope.configuration["stage"]["type"]
+
+    def put(self, stage_type):
         """
         Set the stage geometry.
         """
         microscope = find_component("org.openflexure.microscope")
         microscope.set_stage(stage_type=stage_type)
         return microscope.configuration["stage"]["type"]
-