From ab9cf217aa5c109baade01b731921824fe0265da Mon Sep 17 00:00:00 2001
From: ori agranat <oriagranat9@gmail.com>
Date: Thu, 28 Nov 2019 01:38:45 +0200
Subject: [PATCH] bugfix in 2d pipeline and added area in ui

---
 .../com/chameleonvision/vision/pipeline/CVPipeline2d.java     | 2 +-
 .../vision/pipeline/pipes/GroupContoursPipe.java              | 1 -
 chameleon-client/src/views/Camera.vue                         | 2 +-
 chameleon-client/src/views/CameraViewes/InputTab.vue          | 4 ++--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Main/src/main/java/com/chameleonvision/vision/pipeline/CVPipeline2d.java b/Main/src/main/java/com/chameleonvision/vision/pipeline/CVPipeline2d.java
index b377d5fff..c38670a95 100644
--- a/Main/src/main/java/com/chameleonvision/vision/pipeline/CVPipeline2d.java
+++ b/Main/src/main/java/com/chameleonvision/vision/pipeline/CVPipeline2d.java
@@ -143,7 +143,7 @@ public class CVPipeline2d extends CVPipeline<CVPipeline2dResult, CVPipeline2dSet
         totalPipelineTimeNanos += collect2dTargetsResult.getRight();
 
         // takes pair of (Mat of original camera image (8UC3), Mat of HSV thresholded image(8UC1))
-        Pair<Mat, Long> outputMatResult = outputMatPipe.run(Pair.of(rawCameraMat, hsvResult.getLeft()));
+        Pair<Mat, Long> outputMatResult = outputMatPipe.run(Pair.of(rotateFlipResult.getLeft(), hsvResult.getLeft()));
         totalPipelineTimeNanos += outputMatResult.getRight();
 
         // takes pair of (Mat to draw on, List<RotatedRect> of sorted contours)
diff --git a/Main/src/main/java/com/chameleonvision/vision/pipeline/pipes/GroupContoursPipe.java b/Main/src/main/java/com/chameleonvision/vision/pipeline/pipes/GroupContoursPipe.java
index b2d3df9aa..f0e77cbcc 100644
--- a/Main/src/main/java/com/chameleonvision/vision/pipeline/pipes/GroupContoursPipe.java
+++ b/Main/src/main/java/com/chameleonvision/vision/pipeline/pipes/GroupContoursPipe.java
@@ -88,7 +88,6 @@ public class GroupContoursPipe implements Pipe<List<MatOfPoint>, List<RotatedRec
                                 groupedContours.add(rect);
                             }
                         } catch (IndexOutOfBoundsException e) {
-                            System.err.println("GroupContours: WTF");
                             finalContourList.clear();
                         }
                     }
diff --git a/chameleon-client/src/views/Camera.vue b/chameleon-client/src/views/Camera.vue
index 04011a568..1044efebd 100644
--- a/chameleon-client/src/views/Camera.vue
+++ b/chameleon-client/src/views/Camera.vue
@@ -269,7 +269,7 @@
                     let p = this.$store.state.point.calculated;
                     let fps = this.$store.state.point.fps;
                     if (p !== undefined) {
-                        return ("Pitch: " + parseFloat(p['pitch']).toFixed(2) + " Yaw: " + parseFloat(p['yaw']).toFixed(2) + " FPS: " + fps.toFixed(2))
+                        return `Pitch: ${parseFloat(p['pitch']).toFixed(2)}, Yaw: ${parseFloat(p['yaw']).toFixed(2)}, Area: ${p['area'].toFixed(2)}, FPS: ${fps.toFixed(2)}`
                     } else {
                         return undefined;
                     }
diff --git a/chameleon-client/src/views/CameraViewes/InputTab.vue b/chameleon-client/src/views/CameraViewes/InputTab.vue
index c872e0109..13f187cb4 100644
--- a/chameleon-client/src/views/CameraViewes/InputTab.vue
+++ b/chameleon-client/src/views/CameraViewes/InputTab.vue
@@ -2,8 +2,8 @@
     <div>
         <CVslider name="Exposure" v-model="value.exposure" :min="0" :max="100" @input="handleData('exposure')"/>
         <CVslider name="Brightness" v-model="value.brightness" :min="0" :max="100" @input="handleData('brightness')"/>
-        <CVselect name="Orientation" v-model="value.flipMode" :list="['Normal','Inverted']"
-                  @input="handleData('orientation')"/>
+        <CVselect name="Orientation" v-model="value.rotationMode" :list="['Normal','90°','180°','270°']"
+                  @input="handleData('flipMode')"/>
     </div>
 </template>