From 4160b2aba72039a86906faa9b436d9a664afcc46 Mon Sep 17 00:00:00 2001 From: ori Date: Sat, 21 Sep 2019 09:42:22 -0700 Subject: [PATCH] removed unnecessary parameters --- .../java/com/chameleonvision/vision/process/CameraProcess.java | 3 +-- .../java/com/chameleonvision/vision/process/VisionProcess.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Main/src/main/java/com/chameleonvision/vision/process/CameraProcess.java b/Main/src/main/java/com/chameleonvision/vision/process/CameraProcess.java index 164d16e17..3152f19bf 100644 --- a/Main/src/main/java/com/chameleonvision/vision/process/CameraProcess.java +++ b/Main/src/main/java/com/chameleonvision/vision/process/CameraProcess.java @@ -139,7 +139,7 @@ public class CameraProcess implements Runnable { } FoundContours = visionProcess.FindContours(hsvThreshMat); if (FoundContours.size() > 0) { - FilteredContours = visionProcess.FilterContours(FoundContours, currentPipeline.area, currentPipeline.ratio, currentPipeline.extent, currentPipeline.sort_mode, currentPipeline.target_intersection, currentPipeline.target_group); + FilteredContours = visionProcess.FilterContours(FoundContours, currentPipeline.area, currentPipeline.ratio, currentPipeline.extent); if (FilteredContours.size() > 0) { GroupedContours = visionProcess.GroupTargets(FilteredContours, currentPipeline.target_intersection, currentPipeline.target_group); if (GroupedContours.size() > 0) { @@ -155,7 +155,6 @@ public class CameraProcess implements Runnable { } pipelineResult.Pitch = camera.getCamVals().CalculatePitch(finalRect.center.y, pipelineResult.CalibratedY); pipelineResult.Yaw = camera.getCamVals().CalculateYaw(finalRect.center.x, pipelineResult.CalibratedX); - // TODO Send pitch yaw distance and Raw Point using websockets to client for calib calc drawContour(outputImage, finalRect); } } diff --git a/Main/src/main/java/com/chameleonvision/vision/process/VisionProcess.java b/Main/src/main/java/com/chameleonvision/vision/process/VisionProcess.java index 96ef9a9a4..82cd302f3 100644 --- a/Main/src/main/java/com/chameleonvision/vision/process/VisionProcess.java +++ b/Main/src/main/java/com/chameleonvision/vision/process/VisionProcess.java @@ -50,7 +50,7 @@ public class VisionProcess { } private List FilteredContours = new ArrayList(); - List FilterContours(List InputContours, List area, List ratio, List extent, String SortMode, String TargetIntersection, String TargetGrouping) { + List FilterContours(List InputContours, List area, List ratio, List extent) { for (MatOfPoint Contour : InputContours){ try{ var contourArea = Imgproc.contourArea(Contour);