Merge pull request #15 from uramakilab/fix/ui-fixes

Fix/UI fixes
ruxailab · Nov 29, 2023 · a2ee807 · a2ee807
2 parents dc25e56 + 646c24d
commit a2ee807
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/src/components/calibration/MiscConfigCard.vue b/src/components/calibration/MiscConfigCard.vue
@@ -7,15 +7,17 @@
                 </v-card-title>
                 <div class="custom-outline">
                     Control:
-                    <v-checkbox v-model="isControlled" label="Controlled Calibration" color="black"></v-checkbox>
+                    <v-checkbox v-model="customColors" label="Use Custom Colors" color="black"></v-checkbox>
                 </div>
-                <div class="custom-outline">
-                    Background Color:
-                    <v-color-picker v-model="backgroundColor" hide-inputs></v-color-picker>
-                </div>
-                <div class="custom-outline">
-                    Point Color:
-                    <v-color-picker v-model="pointColor" hide-inputs></v-color-picker>
+                <div v-if="customColors">
+                    <div class="custom-outline">
+                        Background Color:
+                        <v-color-picker v-model="backgroundColor" hide-inputs></v-color-picker>
+                    </div>
+                    <div class="custom-outline">
+                        Point Color:
+                        <v-color-picker v-model="pointColor" hide-inputs></v-color-picker>
+                    </div>
                 </div>
             </v-card>
         </v-col>
@@ -28,7 +30,7 @@ export default {
         return {
             backgroundColor: '#FFFFFFFF',
             pointColor: '#000000FF',
-            isControlled: true,
+            customColors: false,
         }
     },
     watch: {
@@ -38,8 +40,8 @@ export default {
         pointColor(value) {
             this.updatePointColor(value)
         },
-        isControlled(value) {
-            this.updateControlled(value)
+        customColors(value) {
+            this.updateCustomColors(value)
         },
     },
     methods: {
@@ -49,9 +51,9 @@ export default {
         updatePointColor(value) {
             this.$store.commit('setPointColor', value);
         },
-        updateControlled(value) {
-            this.$store.commit('setControlled', value)
-        },
+        updateCustomColors(value) {
+            this.$store.commit('setCustomColors', value);
+        }
     }
 }
 </script>

diff --git a/src/store/calibration.js b/src/store/calibration.js
@@ -8,7 +8,7 @@ export default {
         offset: 50,
         backgroundColor: '#FFFFFFFF',
         pointColor: '#000000FF',
-        isControlled: true,
+        customColors: false,
         blinkFilter: true,
         leftEyeTreshold: 5,
         rightEyeTreshold: 5,
@@ -39,8 +39,8 @@ export default {
         setPointColor(state, newPointColor) {
             state.pointColor = newPointColor
         },
-        setControlled(state, newControlled) {
-            state.isControlled = newControlled
+        setCustomColors(state, newCustomColors) {
+            state.customColors = newCustomColors
         },
         setBlinkFilter(state, newBlinkFilter) {
             state.blinkFilter = newBlinkFilter
@@ -53,7 +53,6 @@ export default {
         },
         setIndex(state, newIndex) {
             state.index = newIndex
-            console.log(`index: ${state.index}`)
         },
     },
     actions: {

diff --git a/src/views/DoubleCalibrationRecord.vue b/src/views/DoubleCalibrationRecord.vue
@@ -158,7 +158,6 @@ export default {
         } else {
           const prediction = { leftIris: leftIris[0], rightIris: rightIris[0] }
           point.data.push(prediction)
-          console.log(point.data.length)
           a++
         }
       }