diff --git a/chameleon-client/src/components/InputTab.vue b/chameleon-client/src/components/InputTab.vue index 8d7ee0e24..c13b4104f 100644 --- a/chameleon-client/src/components/InputTab.vue +++ b/chameleon-client/src/components/InputTab.vue @@ -4,7 +4,7 @@ - + @@ -22,6 +22,13 @@ import chselect from './ch-select.vue' chselect }, methods: { + }, + computed:{ + resolutionList:{ + get:function(){ + return this.$store.state.resolution; + } + } } } diff --git a/chameleon-client/src/components/Vision.vue b/chameleon-client/src/components/Vision.vue index 8373f06cb..bd67ca065 100644 --- a/chameleon-client/src/components/Vision.vue +++ b/chameleon-client/src/components/Vision.vue @@ -3,10 +3,10 @@
- + - +
@@ -47,6 +47,16 @@ } }, computed: { + cameraList:{ + get:function(){ + return this.$store.state.cameraList; + } + }, + piplineList:{ + get: function(){ + return this.$store.state.piplineList; + } + }, steamAdress: { get: function(){ return this.$store.state.streamAdress; diff --git a/chameleon-client/src/components/ch-select.vue b/chameleon-client/src/components/ch-select.vue index 5a2a4ab78..50331ed8c 100644 --- a/chameleon-client/src/components/ch-select.vue +++ b/chameleon-client/src/components/ch-select.vue @@ -4,7 +4,7 @@

{{title.charAt(0).toUpperCase() + title.slice(1)}} :

- + {{item}} diff --git a/chameleon-client/src/store.js b/chameleon-client/src/store.js index 5b58448bb..9094d9117 100644 --- a/chameleon-client/src/store.js +++ b/chameleon-client/src/store.js @@ -15,7 +15,7 @@ export const store = new Vuex.Store({ exposure:54, brightness:0, orientation:0, - resolution:0, + resolution:[], //threshold hue:[0,10], saturation:[0,10], @@ -34,7 +34,10 @@ export const store = new Vuex.Store({ hostName:"", //live info streamAdress:("http://"+location.hostname + ":1181/?stream"), - isBinaryImage:0 + isBinaryImage:0, + //camera lists + cameraList:[], + pipelineList:[] }, mutations:{ @@ -61,7 +64,9 @@ export const store = new Vuex.Store({ gateWay : set('gateWay'), hostName : set('hostName'), streamAdress : set('streamAdress'), - isBinaryImage: set('isBinaryImage') + isBinaryImage: set('isBinaryImage'), + cameraList : set('cameraList'), + pipelineList: set('piplineList') }, getters:{ camera: state => state.camera, @@ -84,7 +89,9 @@ export const store = new Vuex.Store({ gateWay: state => state.gateWay, hostName: state => state.hostName, streamAdress: state => state.streamAdress, - isBinaryImage: state => state.isBinaryImage + isBinaryImage: state => state.isBinaryImage, + cameraList: state => state.cameraList, + pipelineList: state => state.pipelineList }, }); \ No newline at end of file