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

Use pipeline members for setPipeParams (#208)

Browse Source
This commit is contained in:
Banks T
2020-12-31 23:52:34 -05:00
committed by GitHub
parent 69142928b3
commit d92595f622
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
photon-server/src/main/java/org/photonvision/vision/pipeline/CVPipeline.java
View File

@@ -25,8 +25,16 @@ import org.photonvision.vision.pipeline.result.CVPipelineResult;
public abstract class CVPipeline<R extends CVPipelineResult, S extends CVPipelineSettings> {
protected S settings;
protected FrameStaticProperties frameStaticProperties;
protected abstract void setPipeParams(FrameStaticProperties frameStaticProperties, S settings);
protected void setPipeParams(FrameStaticProperties frameStaticProperties, S settings) {
this.settings = settings;
this.frameStaticProperties = frameStaticProperties;
setPipeParamsImpl();
}
protected abstract void setPipeParamsImpl();
protected abstract R process(Frame frame, S settings);

4
photon-server/src/main/java/org/photonvision/vision/pipeline/Calibrate3dPipeline.java
View File

@@ -38,7 +38,6 @@ import org.photonvision.raspi.PicamJNI;
import org.photonvision.server.SocketHandler;
import org.photonvision.vision.calibration.CameraCalibrationCoefficients;
import org.photonvision.vision.frame.Frame;
import org.photonvision.vision.frame.FrameStaticProperties;
import org.photonvision.vision.opencv.CVMat;
import org.photonvision.vision.pipe.CVPipe.CVPipeResult;
import org.photonvision.vision.pipe.impl.CalculateFPSPipe;
@@ -89,8 +88,7 @@ public class Calibrate3dPipeline
}
@Override
protected void setPipeParams(
FrameStaticProperties frameStaticProperties, Calibration3dPipelineSettings settings) {
protected void setPipeParamsImpl() {
FindBoardCornersPipe.FindCornersPipeParams findCornersPipeParams =
new FindBoardCornersPipe.FindCornersPipeParams(
settings.boardHeight, settings.boardWidth, settings.boardType, settings.gridSize);

4
photon-server/src/main/java/org/photonvision/vision/pipeline/ColoredShapePipeline.java
View File

@@ -25,7 +25,6 @@ import org.opencv.core.Mat;
import org.opencv.core.Point;
import org.photonvision.common.util.math.MathUtils;
import org.photonvision.vision.frame.Frame;
import org.photonvision.vision.frame.FrameStaticProperties;
import org.photonvision.vision.opencv.*;
import org.photonvision.vision.pipe.CVPipe.CVPipeResult;
import org.photonvision.vision.pipe.impl.*;
@@ -68,8 +67,7 @@ public class ColoredShapePipeline
}
@Override
protected void setPipeParams(
FrameStaticProperties frameStaticProperties, ColoredShapePipelineSettings settings) {
protected void setPipeParamsImpl() {
DualOffsetValues dualOffsetValues =
new DualOffsetValues(

4
photon-server/src/main/java/org/photonvision/vision/pipeline/DriverModePipeline.java
View File

@@ -23,7 +23,6 @@ import org.opencv.core.Mat;
import org.photonvision.common.util.math.MathUtils;
import org.photonvision.raspi.PicamJNI;
import org.photonvision.vision.frame.Frame;
import org.photonvision.vision.frame.FrameStaticProperties;
import org.photonvision.vision.opencv.CVMat;
import org.photonvision.vision.pipe.impl.CalculateFPSPipe;
import org.photonvision.vision.pipe.impl.Draw2dCrosshairPipe;
@@ -44,8 +43,7 @@ public class DriverModePipeline
}
@Override
protected void setPipeParams(
FrameStaticProperties frameStaticProperties, DriverModePipelineSettings settings) {
protected void setPipeParamsImpl() {
RotateImagePipe.RotateImageParams rotateImageParams =
new RotateImagePipe.RotateImageParams(settings.inputImageRotationMode);
rotateImagePipe.setParams(rotateImageParams);

4
photon-server/src/main/java/org/photonvision/vision/pipeline/ReflectivePipeline.java
View File

@@ -22,7 +22,6 @@ import org.opencv.core.Mat;
import org.photonvision.common.util.math.MathUtils;
import org.photonvision.raspi.PicamJNI;
import org.photonvision.vision.frame.Frame;
import org.photonvision.vision.frame.FrameStaticProperties;
import org.photonvision.vision.opencv.CVMat;
import org.photonvision.vision.opencv.Contour;
import org.photonvision.vision.opencv.DualOffsetValues;
@@ -59,8 +58,7 @@ public class ReflectivePipeline extends CVPipeline<CVPipelineResult, ReflectiveP
}
@Override
protected void setPipeParams(
FrameStaticProperties frameStaticProperties, ReflectivePipelineSettings settings) {
protected void setPipeParamsImpl() {
var dualOffsetValues =
new DualOffsetValues(