Skip to content

Commit adeba05

Browse files
retiututretiutut
committed
Add functional WidgetWithSettings class using the new WidgetSettings class
1 parent 5a5053d commit adeba05

28 files changed

Lines changed: 503 additions & 598 deletions

‎OpenBCI_GUI/AccelerometerEnums.pde‎

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ public enum AccelerometerVerticalScale implements IndexingInterface
88
private int index;
99
private int value;
1010
private String label;
11-
private static AccelerometerVerticalScale[] values = AccelerometerVerticalScale.values();
1211

1312
AccelerometerVerticalScale(int _index, int _value, String _label) {
1413
this.index = _index;
@@ -30,17 +29,9 @@ public enum AccelerometerVerticalScale implements IndexingInterface
3029
return index;
3130
}
3231

33-
public static List<String> getEnumStringsAsList() {
34-
List<String> enumStrings = new ArrayList<>();
35-
for (IndexingInterface enumValue : values) {
36-
enumStrings.add(enumValue.getString());
37-
}
38-
return enumStrings;
39-
}
40-
4132
public int getHighestValue() {
4233
int highestValue = 0;
43-
for (AccelerometerVerticalScale scale : values) {
34+
for (AccelerometerVerticalScale scale : values()) {
4435
if (scale.getValue() > highestValue) {
4536
highestValue = scale.getValue();
4637
}
@@ -60,7 +51,6 @@ public enum AccelerometerHorizontalScale implements IndexingInterface
6051
private int index;
6152
private int value;
6253
private String label;
63-
private static AccelerometerHorizontalScale[] values = AccelerometerHorizontalScale.values();
6454

6555
AccelerometerHorizontalScale(int _index, int _value, String _label) {
6656
this.index = _index;
@@ -82,17 +72,9 @@ public enum AccelerometerHorizontalScale implements IndexingInterface
8272
return index;
8373
}
8474

85-
public static List<String> getEnumStringsAsList() {
86-
List<String> enumStrings = new ArrayList<>();
87-
for (IndexingInterface enumValue : values) {
88-
enumStrings.add(enumValue.getString());
89-
}
90-
return enumStrings;
91-
}
92-
9375
public int getHighestValue() {
9476
int highestValue = 0;
95-
for (AccelerometerHorizontalScale scale : values) {
77+
for (AccelerometerHorizontalScale scale : values()) {
9678
if (scale.getValue() > highestValue) {
9779
highestValue = scale.getValue();
9880
}

‎OpenBCI_GUI/AnalogReadEnums.pde‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ public enum AnalogReadVerticalScale implements IndexingInterface
1111
private int index;
1212
private int value;
1313
private String label;
14-
private static AnalogReadVerticalScale[] values = AnalogReadVerticalScale.values();
1514

1615
AnalogReadVerticalScale(int _index, int _value, String _label) {
1716
this.index = _index;
@@ -32,14 +31,6 @@ public enum AnalogReadVerticalScale implements IndexingInterface
3231
public int getIndex() {
3332
return index;
3433
}
35-
36-
public static List<String> getEnumStringsAsList() {
37-
List<String> enumStrings = new ArrayList<>();
38-
for (IndexingInterface enumValue : values) {
39-
enumStrings.add(enumValue.getString());
40-
}
41-
return enumStrings;
42-
}
4334
}
4435

4536
public enum AnalogReadHorizontalScale implements IndexingInterface
@@ -53,7 +44,6 @@ public enum AnalogReadHorizontalScale implements IndexingInterface
5344
private int index;
5445
private int value;
5546
private String label;
56-
private static AnalogReadHorizontalScale[] values = AnalogReadHorizontalScale.values();
5747

5848
AnalogReadHorizontalScale(int _index, int _value, String _label) {
5949
this.index = _index;
@@ -74,12 +64,4 @@ public enum AnalogReadHorizontalScale implements IndexingInterface
7464
public int getIndex() {
7565
return index;
7666
}
77-
78-
public static List<String> getEnumStringsAsList() {
79-
List<String> enumStrings = new ArrayList<>();
80-
for (IndexingInterface enumValue : values) {
81-
enumStrings.add(enumValue.getString());
82-
}
83-
return enumStrings;
84-
}
8567
}

‎OpenBCI_GUI/BandPowerEnums.pde‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ public enum BPAutoClean implements IndexingInterface
66

77
private int index;
88
private String label;
9-
private static BPAutoClean[] vals = values();
109

1110
BPAutoClean(int _index, String _label) {
1211
this.index = _index;
@@ -22,14 +21,6 @@ public enum BPAutoClean implements IndexingInterface
2221
public int getIndex() {
2322
return index;
2423
}
25-
26-
public static List<String> getEnumStringsAsList() {
27-
List<String> enumStrings = new ArrayList<String>();
28-
for (IndexingInterface val : vals) {
29-
enumStrings.add(val.getString());
30-
}
31-
return enumStrings;
32-
}
3324
}
3425

3526
public enum BPAutoCleanThreshold implements IndexingInterface
@@ -45,7 +36,6 @@ public enum BPAutoCleanThreshold implements IndexingInterface
4536
private int index;
4637
private float value;
4738
private String label;
48-
private static BPAutoCleanThreshold[] vals = values();
4939

5040
BPAutoCleanThreshold(int _index, float _value, String _label) {
5141
this.index = _index;
@@ -66,14 +56,6 @@ public enum BPAutoCleanThreshold implements IndexingInterface
6656
public int getIndex() {
6757
return index;
6858
}
69-
70-
public static List<String> getEnumStringsAsList() {
71-
List<String> enumStrings = new ArrayList<String>();
72-
for (IndexingInterface val : vals) {
73-
enumStrings.add(val.getString());
74-
}
75-
return enumStrings;
76-
}
7759
}
7860

7961
public enum BPAutoCleanTimer implements IndexingInterface
@@ -89,7 +71,6 @@ public enum BPAutoCleanTimer implements IndexingInterface
8971
private int index;
9072
private float value;
9173
private String label;
92-
private static BPAutoCleanTimer[] vals = values();
9374

9475
BPAutoCleanTimer(int _index, float _value, String _label) {
9576
this.index = _index;
@@ -110,12 +91,4 @@ public enum BPAutoCleanTimer implements IndexingInterface
11091
public int getIndex() {
11192
return index;
11293
}
113-
114-
public static List<String> getEnumStringsAsList() {
115-
List<String> enumStrings = new ArrayList<String>();
116-
for (IndexingInterface val : vals) {
117-
enumStrings.add(val.getString());
118-
}
119-
return enumStrings;
120-
}
12194
}

‎OpenBCI_GUI/CytonImpedanceEnums.pde‎

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ public enum CytonSignalCheckMode implements IndexingInterface
66

77
private int index;
88
private String label;
9-
private static CytonSignalCheckMode[] vals = values();
109

1110
CytonSignalCheckMode(int _index, String _label) {
1211
this.index = _index;
@@ -26,14 +25,6 @@ public enum CytonSignalCheckMode implements IndexingInterface
2625
public boolean getIsImpedanceMode() {
2726
return label.equals("Impedance");
2827
}
29-
30-
private static List<String> getEnumStringsAsList() {
31-
List<String> enumStrings = new ArrayList<String>();
32-
for (IndexingInterface val : vals) {
33-
enumStrings.add(val.getString());
34-
}
35-
return enumStrings;
36-
}
3728
}
3829

3930
public enum CytonImpedanceLabels implements IndexingInterface
@@ -45,7 +36,6 @@ public enum CytonImpedanceLabels implements IndexingInterface
4536
private int index;
4637
private String label;
4738
private boolean boolean_value;
48-
private static CytonImpedanceLabels[] vals = values();
4939

5040
CytonImpedanceLabels(int _index, String _label) {
5141
this.index = _index;
@@ -65,29 +55,19 @@ public enum CytonImpedanceLabels implements IndexingInterface
6555
public boolean getIsAnatomicalName() {
6656
return label.equals("Anatomical");
6757
}
68-
69-
private static List<String> getEnumStringsAsList() {
70-
List<String> enumStrings = new ArrayList<String>();
71-
for (IndexingInterface val : vals) {
72-
enumStrings.add(val.getString());
73-
}
74-
return enumStrings;
75-
}
7658
}
7759

7860
public enum CytonImpedanceInterval implements IndexingInterface
7961
{
8062
FOUR (0, 4000, "4 sec"),
8163
FIVE (1, 5000, "5 sec"),
8264
SEVEN (2, 7000, "7 sec"),
83-
TEN (3, 10000, "10 sec")
84-
;
65+
TEN (3, 10000, "10 sec");
8566

8667
private int index;
8768
private int value;
8869
private String label;
8970
private boolean boolean_value;
90-
private static CytonImpedanceInterval[] vals = values();
9171

9272
CytonImpedanceInterval(int _index, int _val, String _label) {
9373
this.index = _index;
@@ -108,12 +88,4 @@ public enum CytonImpedanceInterval implements IndexingInterface
10888
public int getValue() {
10989
return value;
11090
}
111-
112-
private static List<String> getEnumStringsAsList() {
113-
List<String> enumStrings = new ArrayList<String>();
114-
for (IndexingInterface val : vals) {
115-
enumStrings.add(val.getString());
116-
}
117-
return enumStrings;
118-
}
11991
}

‎OpenBCI_GUI/EmgJoystickEnums.pde‎

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,36 +12,29 @@ public enum EmgJoystickSmoothing implements IndexingInterface
1212
private int index;
1313
private String name;
1414
private float value;
15-
private static EmgJoystickSmoothing[] vals = values();
1615

1716
EmgJoystickSmoothing(int index, String name, float value) {
1817
this.index = index;
1918
this.name = name;
2019
this.value = value;
2120
}
2221

22+
@Override
2323
public int getIndex() {
2424
return index;
2525
}
2626

27+
@Override
2728
public String getString() {
2829
return name;
2930
}
3031

3132
public float getValue() {
3233
return value;
3334
}
34-
35-
private static List<String> getEnumStringsAsList() {
36-
List<String> enumStrings = new ArrayList<String>();
37-
for (IndexingInterface val : vals) {
38-
enumStrings.add(val.getString());
39-
}
40-
return enumStrings;
41-
}
4235
}
4336

44-
public class EMGJoystickInput {
37+
public class EMGJoystickInput implements IndexingInterface{
4538
private int index;
4639
private String name;
4740
private int value;
@@ -52,10 +45,12 @@ public class EMGJoystickInput {
5245
this.value = value;
5346
}
5447

48+
@Override
5549
public int getIndex() {
5650
return index;
5751
}
5852

53+
@Override
5954
public String getString() {
6055
return name;
6156
}
@@ -100,12 +95,4 @@ public class EMGJoystickInputs {
10095
}
10196
INPUTS[inputNumber] = VALUES[channel];
10297
}
103-
104-
public List<String> getValueStringsAsList() {
105-
List<String> enumStrings = new ArrayList<String>();
106-
for (EMGJoystickInput val : VALUES) {
107-
enumStrings.add(val.getString());
108-
}
109-
return enumStrings;
110-
}
11198
}

0 commit comments

Comments
 (0)