From b683abad2072347e2cc11fc3e41732adce030a86 Mon Sep 17 00:00:00 2001 From: ori agranat Date: Wed, 27 Nov 2019 22:19:21 +0200 Subject: [PATCH] bug fixed object mapper and changed hsv pipe to bgr --- .../src/main/java/com/chameleonvision/vision/VisionProcess.java | 2 +- .../java/com/chameleonvision/vision/pipeline/pipes/HsvPipe.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Main/src/main/java/com/chameleonvision/vision/VisionProcess.java b/Main/src/main/java/com/chameleonvision/vision/VisionProcess.java index 28e990d68..89e7b51c2 100644 --- a/Main/src/main/java/com/chameleonvision/vision/VisionProcess.java +++ b/Main/src/main/java/com/chameleonvision/vision/VisionProcess.java @@ -52,7 +52,7 @@ public class VisionProcess { private NetworkTableEntry ntAreaEntry; private NetworkTableEntry ntTimeStampEntry; private NetworkTableEntry ntValidEntry; - private ObjectMapper objectMapper; + private ObjectMapper objectMapper = new ObjectMapper(); VisionProcess(CameraCapture cameraCapture, String name) { this.cameraCapture = cameraCapture; diff --git a/Main/src/main/java/com/chameleonvision/vision/pipeline/pipes/HsvPipe.java b/Main/src/main/java/com/chameleonvision/vision/pipeline/pipes/HsvPipe.java index 47544297b..9a271e8bd 100644 --- a/Main/src/main/java/com/chameleonvision/vision/pipeline/pipes/HsvPipe.java +++ b/Main/src/main/java/com/chameleonvision/vision/pipeline/pipes/HsvPipe.java @@ -32,7 +32,7 @@ public class HsvPipe implements Pipe { input.copyTo(processBuffer); try { - Imgproc.cvtColor(processBuffer, processBuffer, Imgproc.COLOR_RGB2HSV, 3); + Imgproc.cvtColor(processBuffer, processBuffer, Imgproc.COLOR_BGR2HSV, 3); Core.inRange(processBuffer, hsvLower, hsvUpper, processBuffer); } catch (CvException e) { System.err.println("(HsvPipe) Exception thrown by OpenCV: \n" + e.getMessage());