Merge pull request #1046 from OpenBCI/filters-ui-team-review

Filters UI team review

Author: retiutut

OpenBCI_GUI/Extras.pde

@@ -76,6 +76,10 @@ public boolean isElevationNeeded(String path) {
         if (path != null) {
             result = !canWrite(path);
         } else {
+            if (isMac()) {
+                //Mac user name is never simply "root"
+                return false;
+            }
             result = !System.getProperty("user.name").equals("root");
         }
     }
@@ -87,6 +91,9 @@ public boolean isElevationNeeded(String path) {
 * @return
 */
 public boolean isAdminUser() {
+    if (isMac()) {
+        return true;
+    }
     if (isWindows()) {
         try {
             String NTAuthority = "HKU\\S-1-5-19";

OpenBCI_GUI/FilterEnums.pde

@@ -27,7 +27,7 @@ public enum BFFilter implements FilterSettingsEnum
 public enum FilterChannelSelect implements FilterSettingsEnum
 {
     ALL_CHANNELS (0, "All Channels"),
-    CUSTOM_CHANNELS (1, "Custom");
+    CUSTOM_CHANNELS (1, "Per Channel");
 
     private int index;
     private String name;

OpenBCI_GUI/FilterSettings.pde

@@ -96,7 +96,7 @@ class FilterSettings {
         channelCount = board.getNumEXGChannels();
 
         values = new FilterSettingsValues(channelCount);
-        defaultValues = values;
+        defaultValues = new FilterSettingsValues(channelCount);
     }
 
     public boolean loadSettingsValues(String filename) {
@@ -143,9 +143,7 @@ class FilterSettings {
     }
 
     public void revertAllChannelsToDefaultValues() {
-        Gson gson = new GsonBuilder().setPrettyPrinting().create();
-        String defaultValsAsString = gson.toJson(defaultValues);
-        values = gson.fromJson(defaultValsAsString, FilterSettingsValues.class);
+        values = new FilterSettingsValues(channelCount);
     }
 
     //Called in UI to control number of channels. This is set from the board when this class is instantiated.
@@ -202,4 +200,4 @@ public void storeFilterSettings(File selection) {
             outputError("Failed to save Filter Settings.");
         }
     }
-}
+}