From 7aa04ae622d35a654421a418e9c43f89d06fc785 Mon Sep 17 00:00:00 2001
From: ori agranat <oriagranat9@gmail.com>
Date: Wed, 26 Feb 2020 19:23:12 +0200
Subject: [PATCH] added 3d accuracy

---
 chameleon-client/src/views/CameraViewes/3D.vue               | 5 ++++-
 .../serializers/StandardCVPipelineSettingsDeserializer.java  | 1 +
 .../serializers/StandardCVPipelineSettingsSerializer.java    | 1 +
 .../vision/pipeline/impl/StandardCVPipelineSettings.java     | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/chameleon-client/src/views/CameraViewes/3D.vue b/chameleon-client/src/views/CameraViewes/3D.vue
index 339c7dc2c..b3042d478 100644
--- a/chameleon-client/src/views/CameraViewes/3D.vue
+++ b/chameleon-client/src/views/CameraViewes/3D.vue
@@ -12,6 +12,7 @@
                 </v-btn>
             </v-col>
         </v-row>
+        <CVslider name="Accuracy" v-model="value.accuracy" :min="0" :max="100" @input="handleData('accuracy')"/>
         <v-row>
             <v-col>
                 <mini-map class="miniMapClass" :targets="targets" :horizontal-f-o-v="horizontalFOV"/>
@@ -29,9 +30,10 @@
 </template>
 
 <script>
+    import Papa from 'papaparse';
     import miniMap from '../../components/3D/MiniMap';
     import CVswitch from '../../components/cv-switch';
-    import Papa from 'papaparse';
+    import CVslider from '../../components/cv-slider'
     import FRCtargetsConfig from '../../assets/FRCtargets'
 
     export default {
@@ -39,6 +41,7 @@
         props: ['value'],
         components: {
             CVswitch,
+            CVslider,
             miniMap
         },
         data() {
diff --git a/chameleon-server/src/main/java/com/chameleonvision/config/serializers/StandardCVPipelineSettingsDeserializer.java b/chameleon-server/src/main/java/com/chameleonvision/config/serializers/StandardCVPipelineSettingsDeserializer.java
index ec909e477..b68d1ccbf 100644
--- a/chameleon-server/src/main/java/com/chameleonvision/config/serializers/StandardCVPipelineSettingsDeserializer.java
+++ b/chameleon-server/src/main/java/com/chameleonvision/config/serializers/StandardCVPipelineSettingsDeserializer.java
@@ -74,6 +74,7 @@ public class StandardCVPipelineSettingsDeserializer extends BaseDeserializer<Sta
 
         pipeline.is3D = getBoolean("is3D", pipeline.is3D);
         pipeline.targetCornerMat = getMatOfPoint3f("targetCornerMat", pipeline.targetCornerMat);
+        pipeline.accuracy = getDouble("accuracy", pipeline.accuracy.doubleValue());
 
         return pipeline;
     }
diff --git a/chameleon-server/src/main/java/com/chameleonvision/config/serializers/StandardCVPipelineSettingsSerializer.java b/chameleon-server/src/main/java/com/chameleonvision/config/serializers/StandardCVPipelineSettingsSerializer.java
index c787d3145..ee8958ed8 100644
--- a/chameleon-server/src/main/java/com/chameleonvision/config/serializers/StandardCVPipelineSettingsSerializer.java
+++ b/chameleon-server/src/main/java/com/chameleonvision/config/serializers/StandardCVPipelineSettingsSerializer.java
@@ -77,6 +77,7 @@ public class StandardCVPipelineSettingsSerializer extends BaseSerializer<Standar
 
         gen.writeBooleanField("is3D", pipeline.is3D);
         writeMatOfPoint3f("targetCornerMat", pipeline.targetCornerMat);
+        gen.writeNumberField("accuracy", pipeline.accuracy.doubleValue());
         gen.writeEndObject();
     }
 }
diff --git a/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/impl/StandardCVPipelineSettings.java b/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/impl/StandardCVPipelineSettings.java
index dd8cd32d7..c81a42133 100644
--- a/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/impl/StandardCVPipelineSettings.java
+++ b/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/impl/StandardCVPipelineSettings.java
@@ -33,6 +33,7 @@ public class StandardCVPipelineSettings extends CVPipelineSettings {
 
     // 3d stuff
     public MatOfPoint3f targetCornerMat = new MatOfPoint3f();
+    public Number accuracy = 2;
     private static MatOfPoint3f hexTargetMat = new MatOfPoint3f();
 
     static {