Fix NullPointerError when loading EMG Settings

Author: retiutut

OpenBCI_GUI/EmgSettings.pde

@@ -25,7 +25,14 @@ class EmgSettings {
                 outputError("Emg Settings: Loaded EMG Settings file has different number of channels than the current board.");
                 return false;
             }
-            values = tempValues;
+            //Explicitely copy values over to avoid reference issues
+            //(e.g. values = tempValues "nukes" the old values object)
+            values.smoothing = tempValues.smoothing;
+            values.uvLimit = tempValues.uvLimit;
+            values.creepIncreasing = tempValues.creepIncreasing;
+            values.creepDecreasing = tempValues.creepDecreasing;
+            values.minimumDeltaUV = tempValues.minimumDeltaUV;
+            values.lowerThresholdMinimum = tempValues.lowerThresholdMinimum;
             return true;
         } catch (IOException e) {
             e.printStackTrace();    

OpenBCI_GUI/EmgSettingsValues.pde

@@ -15,13 +15,13 @@ class EmgSettingsValues {
     public EmgMinimumDeltaUV[] minimumDeltaUV;
     public EmgLowerThresholdMinimum[] lowerThresholdMinimum;
     //Normalized output which is passed to Networking
-    float[] outputNormalized;
+    private transient float[] outputNormalized;
     //These values change during calculations
-    float[] upperThreshold;
-    float[] lowerThreshold;
-    float[] averageuV;
+    private transient float[] upperThreshold;
+    private transient float[] lowerThreshold;
+    private transient float[] averageuV;
 
-    private int channelCount;
+    private transient int channelCount;
 
     EmgSettingsValues() {
 
@@ -101,4 +101,20 @@ class EmgSettingsValues {
             }
         }
     }
+
+    public float getOutputNormalized(int channel) {
+        return outputNormalized[channel];
+    }
+
+    public float getAverageuV(int channel) {
+        return averageuV[channel];
+    }
+
+    public float getUpperThreshold(int channel) {
+        return upperThreshold[channel];
+    }
+
+    public float getLowerThreshold(int channel) {
+        return lowerThreshold[channel];
+    }
 }

OpenBCI_GUI/W_EMG.pde

@@ -122,17 +122,17 @@ class W_emg extends Widget {
                 //realtime
                 fill(channelColors[colorIndex], 200);
                 noStroke();
-                circle(2*colOffset/8, rowOffset / 2, scaleFactor * emgSettingsValues.averageuV[channel]);
+                circle(2*colOffset/8, rowOffset / 2, scaleFactor * emgSettingsValues.getAverageuV(channel));
 
                 //circle for outer threshold
                 noFill();
                 strokeWeight(1);
                 stroke(OPENBCI_DARKBLUE, 150);
-                circle(2*colOffset/8, rowOffset / 2, scaleFactor * emgSettingsValues.upperThreshold[channel]);
+                circle(2*colOffset/8, rowOffset / 2, scaleFactor * emgSettingsValues.getUpperThreshold(channel));
 
                 //circle for inner threshold
                 stroke(OPENBCI_DARKBLUE, 150);
-                circle(2*colOffset/8, rowOffset / 2, scaleFactor * emgSettingsValues.lowerThreshold[channel]);
+                circle(2*colOffset/8, rowOffset / 2, scaleFactor * emgSettingsValues.getLowerThreshold(channel));
 
                 int _x = int(5*colOffset/8);
                 int _y = int(2 * rowOffset / 8);
@@ -142,7 +142,7 @@ class W_emg extends Widget {
                 //draw normalized bar graph of uV w/ matching channel color
                 noStroke();
                 fill(channelColors[colorIndex], 200);
-                rect(_x, 3*_y + 1, _w, map(emgSettingsValues.outputNormalized[channel], 0, 1, 0, (-1) * int((4*rowOffset/8))));
+                rect(_x, 3*_y + 1, _w, map(emgSettingsValues.getOutputNormalized(channel), 0, 1, 0, (-1) * int((4*rowOffset/8))));
 
                 //draw background bar container for mapped uV value indication
                 strokeWeight(1);

OpenBCI_GUI/W_Networking.pde

@@ -1673,7 +1673,7 @@ class Stream extends Thread {
             for (int i = 0; i < numExgChannels; i++) {
                 msg.clearArguments();
                 msg.setAddrPattern(baseOscAddress + "/emg/" + i);
-                msg.add(emgSettingsValues.outputNormalized[i]);
+                msg.add(emgSettingsValues.getOutputNormalized(i));
                 try {
                     this.osc.send(msg, this.oscNetAddress);
                 } catch (Exception e) {
@@ -1683,7 +1683,7 @@ class Stream extends Thread {
         } else if (this.protocol.equals("UDP")) {
             String outputter = "{\"type\":\"emg\",\"data\":[";
             for (int i = 0; i < numExgChannels; i++) {
-                outputter += str(emgSettingsValues.outputNormalized[i]);
+                outputter += str(emgSettingsValues.getOutputNormalized(i));
                 if (i != numExgChannels - 1) {
                     outputter += ",";
                 } else {
@@ -1697,13 +1697,13 @@ class Stream extends Thread {
             }
         } else if (this.protocol.equals("LSL")) {
             for (int i = 0; i < numExgChannels; i++) {
-                dataToSend[i] = emgSettingsValues.outputNormalized[i];
+                dataToSend[i] = emgSettingsValues.getOutputNormalized(i);
             }
             outlet_data.push_sample(dataToSend);
         } else if (this.protocol.equals("Serial")) {
             serialMessage = "";
             for (int i = 0; i < numExgChannels; i++) {
-                float emg_normalized = emgSettingsValues.outputNormalized[i];
+                float emg_normalized = emgSettingsValues.getOutputNormalized(i);
                 String emg_normalized_3dec = threeDecimalPlaces.format(emg_normalized);
                 serialMessage += emg_normalized_3dec;
                 if (i != numExgChannels - 1) {