Convert to MatlabNumericArray if possible

When setting values in the MATLABBindings, only MatlabNumericArrays can
be passed to MATLAB because it is its own JVM (so the pass is by value,
but there is currently no alternative).

Thus if we are not running inside MATLAB we should always try to convert
objects using the ConvertService.

Author: hinerm

src/main/java/org/scijava/plugins/scripting/matlab/MATLABBindings.java

@@ -45,6 +45,7 @@
 import matlabcontrol.extensions.MatlabNumericArray;
 import matlabcontrol.extensions.MatlabTypeConverter;
 
+import org.scijava.convert.ConvertService;
 import org.scijava.log.LogService;
 import org.scijava.options.OptionsService;
 import org.scijava.plugin.Parameter;
@@ -59,6 +60,9 @@ public class MATLABBindings implements Bindings {
 	@Parameter
 	private OptionsService optionsService;
 
+	@Parameter
+	private ConvertService convertService;
+
 	@Parameter
 	private LogService logService;
 
@@ -115,18 +119,29 @@ public Object put(final String name, final Object value) {
 		final MatlabProxy proxy = MATLABControlUtils.proxy(opts());
 
 		// Try special MATLAB data types
-		if (value != null &&
-			MatlabNumericArray.class.isAssignableFrom(value.getClass()))
-		{
+		if (value != null) {
+			MatlabNumericArray arrayVal = null;
+
+			// Cast if able
+			if (MatlabNumericArray.class.isAssignableFrom(value.getClass())) {
+				arrayVal = (MatlabNumericArray) value;
+			}
+			// Convert if able
+			else if (convertService.supports(value, MatlabNumericArray.class)) {
+				arrayVal = convertService.convert(value, MatlabNumericArray.class);
+			}
+
 			// Convert the dataset to a MATLAB array and set it as a local variable
 			// within MATLAB.
-			final MatlabTypeConverter converter = new MatlabTypeConverter(proxy);
-			try {
-				converter.setNumericArray(sanitize(name), (MatlabNumericArray) value);
-				return value;
-			}
-			catch (final MatlabInvocationException e) {
-				logService.warn(e);
+			if (arrayVal != null) {
+				final MatlabTypeConverter converter = new MatlabTypeConverter(proxy);
+				try {
+					converter.setNumericArray(sanitize(name), arrayVal);
+					return value;
+				}
+				catch (final MatlabInvocationException e) {
+					logService.warn(e);
+				}
 			}
 		}