From 207249ca196bf456b9f817cb6f1941c415e8d60b Mon Sep 17 00:00:00 2001
From: ori agranat <oriagranat9@gmail.com>
Date: Wed, 1 Jan 2020 22:06:09 +0200
Subject: [PATCH] WIP: 3D res filter

---
 .../src/views/SettingsViewes/Cameras.vue      | 28 ++++++++++++++-----
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/chameleon-client/src/views/SettingsViewes/Cameras.vue b/chameleon-client/src/views/SettingsViewes/Cameras.vue
index 9e158e76a..de147f01b 100644
--- a/chameleon-client/src/views/SettingsViewes/Cameras.vue
+++ b/chameleon-client/src/views/SettingsViewes/Cameras.vue
@@ -1,10 +1,11 @@
 <template>
     <div>
         <div>
-            <CVselect name="Camera" :list="cameraList" v-model="currentCameraIndex" @input="handleInput('currentCamera',currentCameraIndex)"/>
+            <CVselect name="Camera" :list="cameraList" v-model="currentCameraIndex"
+                      @input="handleInput('currentCamera',currentCameraIndex)"/>
             <CVnumberinput name="Diagonal FOV" v-model="cameraSettings.fov"/>
             <br>
-            <CVnumberinput name="Camera pitch"  v-model="cameraSettings.tilt" :step="0.01"/>
+            <CVnumberinput name="Camera pitch" v-model="cameraSettings.tilt" :step="0.01"/>
             <br>
             <v-btn style="margin-top:10px" small color="#4baf62" @click="sendCameraSettings">Save Camera Settings
             </v-btn>
@@ -14,7 +15,7 @@
             <v-divider color="white" style="margin-bottom: 10px"/>
             <v-row>
                 <v-col>
-                    <CVselect name="Resolution" v-model="resolutionIndex" :list="resolutionList"/>
+                    <CVselect name="Resolution" v-model="resolutionIndex" :list="stringResolutionList"/>
                 </v-col>
                 <v-col>
                     <CVnumberinput name="Square Size (in)" v-model="squareSize"/>
@@ -99,7 +100,7 @@
                     connection_string += "snapshot"
                 } else {
                     connection_string += "startCalibration";
-                    data['resolution'] = this.resolutionIndex;
+                    data['resolution'] = this.filteredResolutionList[this.resolutionIndex].actualIndex;
                     data['squareSize'] = this.squareSize;
                     self.hasEnough = false;
                 }
@@ -170,15 +171,28 @@
                     this.$store.commit('cameraList', value);
                 }
             },
-            resolutionList: {
+            filteredResolutionList: {
                 get() {
                     let tmp_list = [];
-                    for (let i of this.$store.state.resolutionList) {
-                        tmp_list.push(`${i['width']} X ${i['height']} at ${i['fps']} FPS, ${i['pixelFormat']}`)
+                    for (let i in this.$store.state.resolutionList) {
+                        let res = JSON.parse(JSON.stringify(this.$store.state.resolutionList[i]));
+                        if (!tmp_list.some(e => e.width === res.width && e.height === res.height)) {
+                            res['actualIndex'] = i;
+                            tmp_list.push(res);
+                        }
                     }
                     return tmp_list;
                 }
             },
+            stringResolutionList: {
+                get() {
+                    let tmp = [];
+                    for (let i of this.filteredResolutionList) {
+                        tmp.push(`${i['width']} X ${i['height']}`)
+                    }
+                    return tmp
+                }
+            },
             cameraSettings: {
                 get() {
                     return this.$store.state.cameraSettings;