Merge branch 'master' into spinner-bug

Author: ThomasJClark

core/src/main/java/edu/wpi/grip/core/operations/composite/HSLThresholdOperation.java

@@ -20,7 +20,7 @@
  * An {@link edu.wpi.grip.core.Operation} that converts a color image into a binary image based on the HSL threshold ranges
  */
 public class HSLThresholdOperation extends ThresholdOperation {
-    private static final Logger logger =  Logger.getLogger(HSLThresholdOperation.class.getName());
+    private static final Logger logger = Logger.getLogger(HSLThresholdOperation.class.getName());
     private final SocketHint<Mat> inputHint = SocketHints.Inputs.createMatSocketHint("Input", false);
     private final SocketHint<List> hueHint = SocketHints.Inputs.createNumberListRangeSocketHint("Hue", 0.0, 180.0);
     private final SocketHint<List> saturationHint = SocketHints.Inputs.createNumberListRangeSocketHint("Saturation", 0.0, 255.0);
@@ -64,6 +64,10 @@ public void perform(InputSocket<?>[] inputs, OutputSocket<?>[] outputs, Optional
         final List<Number> channel2 = ((InputSocket<List<Number>>) inputs[2]).getValue().get();
         final List<Number> channel3 = ((InputSocket<List<Number>>) inputs[3]).getValue().get();
 
+        if (input.channels() != 3) {
+            throw new IllegalArgumentException("HSL Threshold needs a 3-channel input");
+        }
+
         final OutputSocket<Mat> outputSocket = (OutputSocket<Mat>) outputs[0];
         final Mat output = outputSocket.getValue().get();
 

core/src/main/java/edu/wpi/grip/core/operations/composite/HSVThresholdOperation.java

@@ -22,7 +22,7 @@
  */
 public class HSVThresholdOperation extends ThresholdOperation {
 
-    private static final Logger logger =  Logger.getLogger(HSVThresholdOperation.class.getName());
+    private static final Logger logger = Logger.getLogger(HSVThresholdOperation.class.getName());
     private final SocketHint<Mat> inputHint = SocketHints.Inputs.createMatSocketHint("Input", false);
     private final SocketHint<List> hueHint = SocketHints.Inputs.createNumberListRangeSocketHint("Hue", 0.0, 180.0);
     private final SocketHint<List> saturationHint = SocketHints.Inputs.createNumberListRangeSocketHint("Saturation", 0.0, 255.0);
@@ -67,6 +67,10 @@ public void perform(InputSocket<?>[] inputs, OutputSocket<?>[] outputs, Optional
         final List<Number> channel2 = ((InputSocket<List<Number>>) inputs[2]).getValue().get();
         final List<Number> channel3 = ((InputSocket<List<Number>>) inputs[3]).getValue().get();
 
+        if (input.channels() != 3) {
+            throw new IllegalArgumentException("HSV Threshold needs a 3-channel input");
+        }
+
         final OutputSocket<Mat> outputSocket = (OutputSocket<Mat>) outputs[0];
         final Mat output = outputSocket.getValue().get();
 

core/src/main/java/edu/wpi/grip/core/operations/composite/RGBThresholdOperation.java

@@ -15,7 +15,7 @@
  */
 public class RGBThresholdOperation extends ThresholdOperation {
 
-    private static final Logger logger =  Logger.getLogger(RGBThresholdOperation.class.getName());
+    private static final Logger logger = Logger.getLogger(RGBThresholdOperation.class.getName());
     private final SocketHint<Mat> inputHint = SocketHints.Inputs.createMatSocketHint("Input", false);
     private final SocketHint<List> redHint = SocketHints.Inputs.createNumberListRangeSocketHint("Red", 0.0, 255.0);
     private final SocketHint<List> greenHint = SocketHints.Inputs.createNumberListRangeSocketHint("Green", 0.0, 255.0);
@@ -65,6 +65,10 @@ public void perform(InputSocket<?>[] inputs, OutputSocket<?>[] outputs, Optional
         final List<Number> channel2 = ((InputSocket<List<Number>>) inputs[2]).getValue().get();
         final List<Number> channel3 = ((InputSocket<List<Number>>) inputs[3]).getValue().get();
 
+        if (input.channels() != 3) {
+            throw new IllegalArgumentException("RGB Threshold needs a 3-channel input");
+        }
+
         final OutputSocket<Mat> outputSocket = (OutputSocket<Mat>) outputs[0];
         final Mat output = outputSocket.getValue().get();