Skip to content

Commit 4a4b71c

Browse files
osulacamJLLeitschuh
authored andcommitted
Added enums with fewer options (#628)
* Added enums to avoid showing options that do not work or break grip.
1 parent 6e5b331 commit 4a4b71c

File tree

1 file changed

+49
-3
lines changed

1 file changed

+49
-3
lines changed

core/src/main/java/edu/wpi/grip/core/operations/CVOperations.java

Lines changed: 49 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,8 @@ public class CVOperations {
182182
SocketHints.Inputs.createNumberSpinnerSocketHint("maxValue", 0.0),
183183
SocketHints.createEnumSocketHint("adaptiveMethod",
184184
AdaptiveThresholdTypesEnum.ADAPTIVE_THRESH_MEAN_C),
185-
SocketHints.createEnumSocketHint("thresholdType", ThresholdTypesEnum.THRESH_BINARY),
185+
SocketHints.createEnumSocketHint("thresholdType",
186+
CVAdaptThresholdTypesEnum.THRESH_BINARY),
186187
SocketHints.Inputs.createNumberSpinnerSocketHint("blockSize", 0.0),
187188
SocketHints.Inputs.createNumberSpinnerSocketHint("C", 0.0),
188189
SocketHints.Outputs.createMatSocketHint("dst"),
@@ -274,7 +275,7 @@ public class CVOperations {
274275
-> new Size(1, 1)).build(),
275276
SocketHints.Inputs.createNumberSpinnerSocketHint("sigmaX", 0.0),
276277
SocketHints.Inputs.createNumberSpinnerSocketHint("sigmaY", 0.0), SocketHints
277-
.createEnumSocketHint("borderType", BorderTypesEnum.BORDER_DEFAULT),
278+
.createEnumSocketHint("borderType", CVBorderTypesEnum.BORDER_DEFAULT),
278279
SocketHints.Outputs.createMatSocketHint("dst"),
279280
(src, ksize, sigmaX, sigmaY, borderType, dst) -> {
280281
opencv_imgproc.GaussianBlur(src, dst, ksize, sigmaX.doubleValue(), sigmaY
@@ -370,7 +371,7 @@ public class CVOperations {
370371
SocketHints.Inputs.createMatSocketHint("src", false),
371372
SocketHints.Inputs.createNumberSpinnerSocketHint("thresh", 0),
372373
SocketHints.Inputs.createNumberSpinnerSocketHint("maxval", 0),
373-
SocketHints.createEnumSocketHint("type", ThresholdTypesEnum.THRESH_BINARY),
374+
SocketHints.createEnumSocketHint("type", CVThresholdTypesEnum.THRESH_BINARY),
374375
SocketHints.Outputs.createMatSocketHint("dst"),
375376
(src, thresh, maxval, type, dst) -> {
376377
opencv_imgproc.threshold(src, dst, thresh.doubleValue(), maxval.doubleValue(),
@@ -380,6 +381,51 @@ public class CVOperations {
380381
);
381382
}
382383

384+
public enum CVThresholdTypesEnum {
385+
THRESH_BINARY(ThresholdTypesEnum.THRESH_BINARY.value),
386+
THRESH_BINARY_INV(ThresholdTypesEnum.THRESH_BINARY_INV.value),
387+
THRESH_TRUNC(ThresholdTypesEnum.THRESH_TRUNC.value),
388+
THRESH_TOZERO(ThresholdTypesEnum.THRESH_TOZERO.value),
389+
THRESH_TOZERO_INV(ThresholdTypesEnum.THRESH_TOZERO_INV.value),
390+
THRESH_OTSU(ThresholdTypesEnum.THRESH_OTSU.value),
391+
THRESH_TRIANGLE(ThresholdTypesEnum.THRESH_TRIANGLE.value);
392+
393+
public final int value;
394+
395+
CVThresholdTypesEnum(int value) {
396+
this.value = value;
397+
}
398+
}
399+
400+
public enum CVAdaptThresholdTypesEnum {
401+
THRESH_BINARY(ThresholdTypesEnum.THRESH_BINARY.value),
402+
THRESH_BINARY_INV(ThresholdTypesEnum.THRESH_BINARY_INV.value);
403+
404+
public final int value;
405+
406+
CVAdaptThresholdTypesEnum(int value) {
407+
this.value = value;
408+
}
409+
}
410+
411+
public enum CVBorderTypesEnum {
412+
413+
BORDER_CONSTANT(BorderTypesEnum.BORDER_CONSTANT.value),
414+
R_REPLICATE(BorderTypesEnum.BORDER_REPLICATE.value),
415+
BORDER_REFLECT(BorderTypesEnum.BORDER_REFLECT.value),
416+
BORDER_REFLECT_101(BorderTypesEnum.BORDER_REFLECT_101.value),
417+
BORDER_REFLECT101(BorderTypesEnum.BORDER_REFLECT101.value),
418+
BORDER_DEFAULT(BorderTypesEnum.BORDER_DEFAULT.value),
419+
BORDER_ISOLATED(BorderTypesEnum.BORDER_ISOLATED.value);
420+
421+
public final int value;
422+
423+
CVBorderTypesEnum(int value) {
424+
this.value = value;
425+
}
426+
}
427+
428+
383429
/**
384430
* All of the operations that this list supplies.
385431
*/

0 commit comments

Comments
 (0)