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

Rename USBCamera to USBCameraProcess & abstractify

Browse Source 
- Most classes now take a CameraProcess instead of a USBCameraProcess
This commit is contained in:
Matt
2019-11-07 09:10:09 -08:00
parent 338c59e783
commit cc2c065dc8
9 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Main/src/main/java/com/chameleonvision/classabstraction/pipeline/CVPipeline2d.java
View File

@@ -1,7 +1,7 @@
package com.chameleonvision.classabstraction.pipeline;
import com.chameleonvision.classabstraction.camera.CameraProcess;
import com.chameleonvision.classabstraction.camera.CameraStaticProperties;
import com.chameleonvision.classabstraction.camera.USBCamera;
import com.chameleonvision.classabstraction.pipeline.pipes.*;
import com.chameleonvision.vision.ImageRotation;
import org.apache.commons.lang3.tuple.Pair;
@@ -13,7 +13,7 @@ import java.util.List;
@SuppressWarnings("WeakerAccess")
public class CVPipeline2d extends CVPipeline<CVPipeline2d.CVPipeline2dResult, CVPipeline2d.CVPipeline2dSettings> {
private USBCamera camera;
private CameraProcess cameraProcess;
private Mat rawCameraMat = new Mat();
private Mat hsvOutputMat = new Mat();
@@ -23,8 +23,8 @@ public class CVPipeline2d extends CVPipeline<CVPipeline2d.CVPipeline2dResult, CV
}
@Override
void initPipeline(USBCamera cam) {
camera = cam;
void initPipeline(CameraProcess cam) {
cameraProcess = cam;
}
@Override
@@ -32,7 +32,7 @@ public class CVPipeline2d extends CVPipeline<CVPipeline2d.CVPipeline2dResult, CV
long totalProcessTimeNanos = 0;
StringBuilder procTimeStringBuilder = new StringBuilder();
CameraStaticProperties camProps = camera.properties.staticProperties;
CameraStaticProperties camProps = cameraProcess.getProperties().staticProperties;
inputMat.copyTo(rawCameraMat);