From f97dcb6abc4b8ded8db86ec8bd1ce04254f12057 Mon Sep 17 00:00:00 2001
From: Richard Bowman <richard.bowman@cantab.net>
Date: Fri, 1 Dec 2023 01:45:45 +0000
Subject: [PATCH] More tidying up to use new thing property functions

---
 .../settingsComponents/cameraSettings.vue           | 13 +++++--------
 .../settingsComponents/stageSettings.vue            |  5 +----
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/webapp/src/components/tabContentComponents/settingsComponents/cameraSettings.vue b/webapp/src/components/tabContentComponents/settingsComponents/cameraSettings.vue
index ea08f866..fbca1af1 100644
--- a/webapp/src/components/tabContentComponents/settingsComponents/cameraSettings.vue
+++ b/webapp/src/components/tabContentComponents/settingsComponents/cameraSettings.vue
@@ -15,19 +15,19 @@
                   <PropertyControl
                     label="Exposure time"
                     property-name="exposure_time"
-                    :thing-description="thingDescription"
+                    thing-name="camera"
                     :read-back-delay="1000"
                   />
                   <PropertyControl
                     label="Analogue gain"
                     property-name="analogue_gain"
-                    :thing-description="thingDescription"
+                    thing-name="camera"
                     :read-back-delay="1000"
                   />
                   <PropertyControl
                     label="Colour gains"
                     property-name="colour_gains"
-                    :thing-description="thingDescription"
+                    thing-name="camera"
                     :read-back-delay="1000"
                   />
                 </div>
@@ -38,13 +38,13 @@
                   <PropertyControl
                     label="MJPEG stream bit rate"
                     property-name="mjpeg_bitrate"
-                    :thing-description="thingDescription"
+                    thing-name="camera"
                     :read-back-delay="100"
                   />
                   <PropertyControl
                     label="MJPEG stream resolution"
                     property-name="stream_resolution"
-                    :thing-description="thingDescription"
+                    thing-name="camera"
                     :read-back-delay="100"
                   />
                 </div>
@@ -144,9 +144,6 @@ export default {
     cameraUri: function() {
       return `${this.$store.getters.baseUri}/camera/`;
     },
-    thingDescription: function() {
-      return this.$store.getters["wot/thingDescription"]("camera");
-    }
   }
 };
 </script>
diff --git a/webapp/src/components/tabContentComponents/settingsComponents/stageSettings.vue b/webapp/src/components/tabContentComponents/settingsComponents/stageSettings.vue
index aab40c7c..483f7478 100644
--- a/webapp/src/components/tabContentComponents/settingsComponents/stageSettings.vue
+++ b/webapp/src/components/tabContentComponents/settingsComponents/stageSettings.vue
@@ -19,10 +19,7 @@ export default {
 
   computed: {
     stageType: function() {
-      return this.thingDescription.title;
-    },
-    thingDescription: function() {
-      return this.$store.getters["wot/thingDescription"]("stage");
+      return this.thingDescription("stage").title;
     }
   }
 };