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

Continue plumbing ServerHandler

Browse Source
This commit is contained in:
Banks Troutman
2019-11-23 04:05:37 -05:00
parent b19ae1f43b
commit 9b3e611eaa
21 changed files with 362 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Main/src/main/java/com/chameleonvision/vision/Orientation.java
View File

@@ -1,5 +1,7 @@
package com.chameleonvision.vision;
public enum Orientation {
Normal,Inverted//TODO add 90 and 270 deg rotation?
//TODO: (low) add 90 and 270 deg rotation?
Normal,
Inverted;
}

5
Main/src/main/java/com/chameleonvision/vision/process/VisionProcess.java
View File

@@ -4,7 +4,6 @@ import com.chameleonvision.classabstraction.pipeline.CVPipeline2d;
import com.chameleonvision.classabstraction.pipeline.CVPipeline2dSettings;
import com.chameleonvision.classabstraction.pipeline.DriverVisionPipeline;
import com.chameleonvision.settings.SettingsManager;
import com.chameleonvision.vision.Orientation;
import com.chameleonvision.vision.Pipeline;
import com.chameleonvision.web.ServerHandler;
import edu.wpi.cscore.VideoException;
@@ -131,7 +130,7 @@ public class VisionProcess implements Runnable {
private PipelineResult runVisionProcess(Mat inputImage, Mat outputImage) {
if (cvPipeline2d == null) {
cvPipeline2d = new CVPipeline2d(() -> pipelineTo2dSettings(currentPipeline));
cvPipeline2d = new CVPipeline2d(pipelineTo2dSettings(currentPipeline));
}
CVPipeline2dResult result = cvPipeline2d.runPipeline(inputImage);
result.outputMat.copyTo(outputImage);
@@ -145,7 +144,7 @@ public class VisionProcess implements Runnable {
pipeResult.Yaw = 0;
pipeResult.Area = 0;
} else {
Target t = result.targets.get(0);
Target2d t = result.targets.get(0);
pipeResult.CalibratedX = t.calibratedX;
pipeResult.CalibratedY = t.calibratedY;
pipeResult.Pitch = t.pitch;