Team2890/PhotonVision
4
0
Fork 0
mirror of https://github.com/PhotonVision/photonvision synced 2026-07-04 03:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove ErodeDilate from UI and ColoredShapePipeline (#829)

Browse Source
This commit is contained in:
Stephen Day
2023-04-18 18:50:01 -04:00
committed by GitHub
parent c148331b69
commit 6bdb158b33
3 changed files with 1 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
photon-core/src/main/java/org/photonvision/vision/pipeline/ColoredShapePipeline.java
View File

@@ -34,7 +34,6 @@ import org.photonvision.vision.target.TrackedTarget;
@SuppressWarnings({"DuplicatedCode"})
public class ColoredShapePipeline
extends CVPipeline<CVPipelineResult, ColoredShapePipelineSettings> {
private final ErodeDilatePipe erodeDilatePipe = new ErodeDilatePipe();
private final SpeckleRejectPipe speckleRejectPipe = new SpeckleRejectPipe();
private final FindContoursPipe findContoursPipe = new FindContoursPipe();
private final FindPolygonPipe findPolygonPipe = new FindPolygonPipe();
@@ -72,11 +71,6 @@ public class ColoredShapePipeline
settings.offsetDualPointB,
settings.offsetDualPointBArea);
ErodeDilatePipe.ErodeDilateParams erodeDilateParams =
new ErodeDilatePipe.ErodeDilateParams(settings.erode, settings.dilate, 5);
// TODO: add kernel size to pipeline settings
erodeDilatePipe.setParams(erodeDilateParams);
SpeckleRejectPipe.SpeckleRejectParams speckleRejectParams =
new SpeckleRejectPipe.SpeckleRejectParams(settings.contourSpecklePercentage);
speckleRejectPipe.setParams(speckleRejectParams);
@@ -175,12 +169,6 @@ public class ColoredShapePipeline
protected CVPipelineResult process(Frame frame, ColoredShapePipelineSettings settings) {
long sumPipeNanosElapsed = 0L;
// var erodeDilateResult = erodeDilatePipe.run(rawInputMat);
// sumPipeNanosElapsed += erodeDilateResult.nanosElapsed;
//
// CVPipeResult<Mat> hsvPipeResult = hsvPipe.run(rawInputMat);
// sumPipeNanosElapsed += hsvPipeResult.nanosElapsed;
CVPipeResult<List<Contour>> findContoursResult =
findContoursPipe.run(frame.processedImage.getMat());
sumPipeNanosElapsed += findContoursResult.nanosElapsed;

9
photon-core/src/main/java/org/photonvision/vision/pipeline/ColoredShapePipelineSettings.java
View File

@@ -39,9 +39,6 @@ public class ColoredShapePipelineSettings extends AdvancedPipelineSettings {
// 3d settings
public CameraCalibrationCoefficients cameraCalibration;
public boolean erode = false;
public boolean dilate = false;
public ColoredShapePipelineSettings() {
super();
pipelineType = PipelineType.ColoredShape;
@@ -64,8 +61,6 @@ public class ColoredShapePipelineSettings extends AdvancedPipelineSettings {
&& cornerDetectionSideCount == that.cornerDetectionSideCount
&& Double.compare(that.cornerDetectionAccuracyPercentage, cornerDetectionAccuracyPercentage)
== 0
&& erode == that.erode
&& dilate == that.dilate
&& contourShape == that.contourShape
&& Objects.equals(contourArea, that.contourArea)
&& Objects.equals(contourPerimeter, that.contourPerimeter)
@@ -96,8 +91,6 @@ public class ColoredShapePipelineSettings extends AdvancedPipelineSettings {
cornerDetectionUseConvexHulls,
cornerDetectionExactSideCount,
cornerDetectionSideCount,
cornerDetectionAccuracyPercentage,
erode,
dilate);
cornerDetectionAccuracyPercentage);
}
}