diff --git a/photon-client/src/views/PipelineViews/ThresholdTab.vue b/photon-client/src/views/PipelineViews/ThresholdTab.vue
index f01d7ee63..82ab409b3 100644
--- a/photon-client/src/views/PipelineViews/ThresholdTab.vue
+++ b/photon-client/src/views/PipelineViews/ThresholdTab.vue
@@ -41,23 +41,6 @@
@input="handlePipelineData('hueInverted')"
@rollback="e => rollback('hueInverted',e)"
/>
-
- rollback('erode',e)"
- />
- rollback('dilate',e)"
- />
-
Color Picker
@@ -195,22 +178,6 @@ export default {
this.$store.commit("mutatePipeline", {"hsvValue": val});
}
},
- erode: {
- get() {
- return this.$store.getters.currentPipelineSettings.erode;
- },
- set(val) {
- this.$store.commit("mutatePipeline", {"erode": val});
- }
- },
- dilate: {
- get() {
- return this.$store.getters.currentPipelineSettings.dilate;
- },
- set(val) {
- this.$store.commit("mutatePipeline", {"dilate": val});
- }
- },
},
mounted: function () {
const self = this;
diff --git a/photon-core/src/main/java/org/photonvision/vision/pipeline/ColoredShapePipeline.java b/photon-core/src/main/java/org/photonvision/vision/pipeline/ColoredShapePipeline.java
index dd4227824..df108d7b2 100644
--- a/photon-core/src/main/java/org/photonvision/vision/pipeline/ColoredShapePipeline.java
+++ b/photon-core/src/main/java/org/photonvision/vision/pipeline/ColoredShapePipeline.java
@@ -34,7 +34,6 @@ import org.photonvision.vision.target.TrackedTarget;
@SuppressWarnings({"DuplicatedCode"})
public class ColoredShapePipeline
extends CVPipeline {
- 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 hsvPipeResult = hsvPipe.run(rawInputMat);
- // sumPipeNanosElapsed += hsvPipeResult.nanosElapsed;
-
CVPipeResult> findContoursResult =
findContoursPipe.run(frame.processedImage.getMat());
sumPipeNanosElapsed += findContoursResult.nanosElapsed;
diff --git a/photon-core/src/main/java/org/photonvision/vision/pipeline/ColoredShapePipelineSettings.java b/photon-core/src/main/java/org/photonvision/vision/pipeline/ColoredShapePipelineSettings.java
index 7f00089ed..62db7bc9e 100644
--- a/photon-core/src/main/java/org/photonvision/vision/pipeline/ColoredShapePipelineSettings.java
+++ b/photon-core/src/main/java/org/photonvision/vision/pipeline/ColoredShapePipelineSettings.java
@@ -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);
}
}