Fix Blur and RGBThreshold for Python. Add RGBThreshold tests (#727)

Author: SamCarlberg

ui/src/main/resources/edu/wpi/grip/ui/codegeneration/python/operations/Blur.vm

@@ -10,13 +10,13 @@
             A numpy.ndarray that has been blurred.
         """
         if(type is BlurType.Box_Blur):
-            ksize = 2 * round(radius) + 1
-            return cv2.blur(src,(ksize,ksize))
+            ksize = int(2 * round(radius) + 1)
+            return cv2.blur(src, (ksize, ksize))
         elif(type is BlurType.Gaussian_Blur):
-            ksize = 6 * round(radius) + 1
-            return cv2.GaussianBlur(src, (ksize,ksize), round(radius))
+            ksize = int(6 * round(radius) + 1)
+            return cv2.GaussianBlur(src, (ksize, ksize), round(radius))
         elif(type is BlurType.Median_Filter):
-            ksize = 2 * round(radius) + 1
+            ksize = int(2 * round(radius) + 1)
             return cv2.medianBlur(src, ksize)
         else:
-            return cv2.bilateralFilter(src,-1,round(radius),round(radius))
+            return cv2.bilateralFilter(src, -1, round(radius), round(radius))

ui/src/main/resources/edu/wpi/grip/ui/codegeneration/python/operations/RGB_Threshold.vm

@@ -1,11 +1,11 @@
     @staticmethod
-    def $tMeth.name($step.name())(input, red, green, blue, out):
+    def $tMeth.name($step.name())(input, red, green, blue):
         """Segment an image based on color ranges.
         Args:
             input: A BGR numpy.ndarray.
-            hue: A list of two numbers the are the min and max red.
-            sat: A list of two numbers the are the min and max green.
-            lum: A list of two numbers the are the min and max blue.
+            red: A list of two numbers the are the min and max red.
+            green: A list of two numbers the are the min and max green.
+            blue: A list of two numbers the are the min and max blue.
         Returns:
             A black and white numpy.ndarray.
         """

ui/src/test/java/edu/wpi/grip/ui/codegeneration/RGBThresholdTesting.java

@@ -11,31 +11,27 @@
 import edu.wpi.grip.ui.codegeneration.tools.PipelineInterfacer;
 import edu.wpi.grip.util.Files;
 
+import org.junit.Test;
 import org.opencv.core.Mat;
 
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+@SuppressWarnings("PMD.JUnitSpelling")
 public class RGBThresholdTesting extends AbstractGenerationTesting {
 
   boolean setup() {
     final Step rgb = gen.addStep(new OperationMetaData(RGBThresholdOperation.DESCRIPTION,
         () -> new RGBThresholdOperation(isf, osf)));
     loadImage(Files.gompeiJpegFile);
     OutputSocket imgOut = pipeline.getSources().get(0).getOutputSockets().get(0);
-    List<Double> rVal = new ArrayList<Double>();
-    List<Double> gVal = new ArrayList<Double>();
-    List<Double> bVal = new ArrayList<Double>();
-    rVal.add(new Double(46));
-    rVal.add(new Double(188));
-    gVal.add(new Double(0));
-    gVal.add(new Double(110));
-    bVal.add(new Double(0));
-    bVal.add(new Double(110));
+    List<Double> rVal = Arrays.asList(46d, 188d);
+    List<Double> gVal = Arrays.asList(0d, 110d);
+    List<Double> bVal = Arrays.asList(0d, 110d);
     for (InputSocket sock : rgb.getInputSockets()) {
       String sockHint = sock.getSocketHint().getIdentifier();
       if ("Input".equals(sockHint)) {
@@ -64,4 +60,10 @@ void pipelineTest(PipelineInterfacer pip) {
     Mat gripMat = HelperTools.bytedecoMatToCVMat((org.bytedeco.javacpp.opencv_core.Mat) out.get());
     assertMatWithin(genMat, gripMat, 2.0);
   }
+
+  @Test
+  public void test() {
+    test(this::setup, this::pipelineTest, "RGBThresholdTesting");
+  }
+
 }