Team2890/PhotonVision
4
0
Fork 0
mirror of https://github.com/PhotonVision/photonvision synced 2026-06-20 00:51:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

changed gorup from cnter to line mass

Browse Source
This commit is contained in:
ori agranat
2019-09-23 12:36:57 -07:00
parent 5389d79532
commit 478222b428
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Main/src/main/java/com/chameleonvision/vision/process/CVProcess.java
View File

@@ -116,6 +116,10 @@ public class CVProcess {
if (IsIntersecting(firstContour, secondContour, IntersectionPoint)) {
FinalContourList.addAll(secondContour.toList());
}
else{
FinalContourList.clear();
break;
}
firstContour.release();
secondContour.release();
MatOfPoint2f contour = new MatOfPoint2f();
@@ -161,29 +165,33 @@ public class CVProcess {
double x0B = intersectMatB.get(2, 0)[0];
double y0B = intersectMatB.get(3, 0)[0];
double mB = vyB / vxB;
double bA = y0A - (mA*x0A);
double bB = y0B - (mB*x0B);
double intersectionX = ((mA * x0A) - y0A - (mB * x0B) + y0B )/ (mA - mB);
double intersectionY = (mA * (intersectionX - x0A)) + y0A;
double massX = intersectionX + 1;
double massY = intersectionY + ((mA + bA + mB +bB) / 2);
switch (IntersectionPoint) {
case "Up": {
if (intersectionY < CamVals.CenterY) {
if (intersectionY < massY) {
return true;
}
break;
}
case "Down": {
if (intersectionY > CamVals.CenterY) {
if (intersectionY > massY) {
return true;
}
break;
}
case "Left": {
if (intersectionX < CamVals.CenterX) {
if (intersectionX < massX) {
return true;
}
break;
}
case "Right": {
if (intersectionX > CamVals.CenterX) {
if (intersectionX > massX) {
return true;
}
break;