From 5f8f7ca5558fc974376125caa7c5735b4e79966f Mon Sep 17 00:00:00 2001
From: Unknown <oriagranat9@gmail.com>
Date: Wed, 1 Jan 2020 15:46:05 +0200
Subject: [PATCH] updated pom for release, 3d calibration change, cosmetic
 changes

---
 .../src/components/cv-range-slider.vue           |  4 ++--
 chameleon-client/src/components/cv-switch.vue    |  4 ++--
 chameleon-client/src/store.js                    | 16 +++++++++++-----
 chameleon-client/src/views/CameraViewes/3D.vue   | 15 +++++++++++++--
 chameleon-server/pom.xml                         | 13 ++++---------
 5 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/chameleon-client/src/components/cv-range-slider.vue b/chameleon-client/src/components/cv-range-slider.vue
index 571fa086f..09543ba6b 100644
--- a/chameleon-client/src/components/cv-range-slider.vue
+++ b/chameleon-client/src/components/cv-range-slider.vue
@@ -8,13 +8,13 @@
                 <v-range-slider :value="localValue" @input="handleInput" :max="max" :min="min" hide-details
                                 class="align-center" dark color="#4baf62" :step="step">
                     <template v-slot:prepend>
-                        <v-text-field :value="localValue[0]" :max="max" :min="min" @input="handleChange"
+                        <v-text-field dark :value="localValue[0]" :max="max" :min="min" @input="handleChange"
                                       @focus="prependFocused = true" @blur="prependFocused = false" class="mt-0 pt-0"
                                       hide-details single-line type="number" style="width: 50px" :step="step"/>
                     </template>
 
                     <template v-slot:append>
-                        <v-text-field :value="localValue[1]" :max="max" :min="min" @input="handleChange"
+                        <v-text-field dark :value="localValue[1]" :max="max" :min="min" @input="handleChange"
                                       @focus="appendFocused = true" @blur="appendFocused = false" class="mt-0 pt-0"
                                       hide-details single-line type="number" style="width: 50px" :step="step"/>
                     </template>
diff --git a/chameleon-client/src/components/cv-switch.vue b/chameleon-client/src/components/cv-switch.vue
index de049dc09..e2ce0854a 100644
--- a/chameleon-client/src/components/cv-switch.vue
+++ b/chameleon-client/src/components/cv-switch.vue
@@ -5,7 +5,7 @@
                 <span>{{name}}</span>
             </v-col>
             <v-col>
-                <v-switch v-model="localValue" color="#4baf62"/>
+                <v-switch dark :disabled="disabled" v-model="localValue" color="#4baf62"/>
             </v-col>
         </v-row>
     </div>
@@ -14,7 +14,7 @@
 <script>
     export default {
         name: 'CVSwitch',
-        props: ['name', 'value'],
+        props: ['name', 'value', 'disabled'],
         data() {
             return {}
         },
diff --git a/chameleon-client/src/store.js b/chameleon-client/src/store.js
index 7ea70150c..adf87ef93 100644
--- a/chameleon-client/src/store.js
+++ b/chameleon-client/src/store.js
@@ -33,14 +33,20 @@ export default new Vuex.Store({
             targetGrouping: 0,
             targetIntersection: 0,
             sortMode: 0,
-            multiple:false,
+            multiple: false,
             isBinary: 0,
             calibrationMode: 0,
-            videoModeIndex:0,
-            streamDivisor:0,
-            is3D:false
+            videoModeIndex: 0,
+            streamDivisor: 0,
+            is3D: false
+        },
+        cameraSettings: {
+            calibration: [],
+            fov: 0,
+            resolution: 0,
+            streamDivisor: 0,
+            tilt: 0
         },
-        cameraSettings: {},
         resolutionList: [],
         port: 1181,
         currentCameraIndex: 0,
diff --git a/chameleon-client/src/views/CameraViewes/3D.vue b/chameleon-client/src/views/CameraViewes/3D.vue
index cf7d9af92..4a8a42777 100644
--- a/chameleon-client/src/views/CameraViewes/3D.vue
+++ b/chameleon-client/src/views/CameraViewes/3D.vue
@@ -2,7 +2,7 @@
     <div>
         <v-row align="center" justify="start" dense>
             <v-col :cols="6">
-                <CVswitch v-model="value.is3D" name="Enable 3D" @input="handleData('is3D')"/>
+                <CVswitch :disabled="allow3D" v-model="value.is3D" name="Enable 3D" @input="handleData('is3D')"/>
             </v-col>
             <v-col>
                 <CVnumberInput name="Max Height:" v-model="value.targetHeight" @input="handleData('targetHeight')"/>
@@ -62,7 +62,6 @@
                 get() {
                     return this.$store.state.point.targets;
                 }
-
             },
             horizontalFOV: {
                 get() {
@@ -73,6 +72,18 @@
                     let diagonalAspect = Math.hypot(resolution.width, resolution.height);
                     return Math.atan(Math.tan(diagonalView / 2) * (resolution.width / diagonalAspect)) * 2 * (180 / Math.PI)
                 }
+            },
+            allow3D:{
+                get(){
+                    let currentRes = this.$store.state.resolutionList[this.$store.state.pipeline.videoModeIndex];
+                    console.log('change');
+                    for (let res of this.$store.state.cameraSettings.calibration){
+                        if (currentRes.width === res.width && currentRes.height === res.height){
+                            return false;
+                        }
+                    }
+                    return true;
+                }
             }
         }
     }
diff --git a/chameleon-server/pom.xml b/chameleon-server/pom.xml
index f5b9be684..9605ed092 100644
--- a/chameleon-server/pom.xml
+++ b/chameleon-server/pom.xml
@@ -31,7 +31,8 @@
                         </goals>
                         <configuration>
                             <transformers>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                <transformer
+                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <mainClass>com.chameleonvision.Main</mainClass>
                                 </transformer>
                             </transformers>
@@ -43,20 +44,14 @@
     </build>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <wpilib.version>2020.1.1-beta-3-15-g7b9c6eb</wpilib.version>
+        <wpilib.version>2020.1.1</wpilib.version>
         <opencv.version>3.4.7-2</opencv.version>
     </properties>
     <repositories>
-        <!--WPI official maven repo for frc libs-->
-<!--        <repository>-->
-<!--            <id>WPI</id>-->
-<!--            <name>WPI Maven repo</name>-->
-<!--            <url>https://first.wpi.edu/FRC/roborio/maven/release</url>-->
-<!--        </repository>-->
         <repository>
             <id>WPI</id>
             <name>WPILib Artifactory Server-releases</name>
-            <url>https://frcmaven.wpi.edu:443/artifactory/development</url>
+            <url>https://frcmaven.wpi.edu:443/artifactory/release</url>
         </repository>
     </repositories>
     <dependencies>