Skip to content

Commit 07fb130

Browse files
retiututretiutut
committed
Pair team review and style coding
1 parent ae85ed2 commit 07fb130

11 files changed

Lines changed: 32 additions & 27 deletions

‎OpenBCI_GUI/ADS1299SettingsController.pde‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -314,8 +314,8 @@ class ADS1299SettingsController {
314314
ScrollableList list = hwsCp5.addScrollableList(name)
315315
.setOpen(false)
316316
.setColorBackground(_backgroundColor) // text field bg color
317-
.setColorValueLabel(color(0)) // text color
318-
.setColorCaptionLabel(color(0))
317+
.setColorValueLabel(OPENBCI_DARKBLUE) // text color
318+
.setColorCaptionLabel(OPENBCI_DARKBLUE)
319319
.setColorForeground(color(125)) // border color when not selected
320320
.setColorActive(BUTTON_PRESSED) // border color when selected
321321
.setOutlineColor(OBJECT_BORDER_GREY)
@@ -391,7 +391,7 @@ class ADS1299SettingsController {
391391
.setFocus(false)
392392
.setColor(color(26, 26, 26))
393393
.setColorBackground(color(255, 255, 255)) // text field bg color
394-
.setColorValueLabel(color(0, 0, 0)) // text color
394+
.setColorValueLabel(OPENBCI_DARKBLUE) // text color
395395
.setColorForeground(OBJECT_BORDER_GREY) // border color when not selected
396396
.setColorActive(isSelected_color) // border color when selected
397397
.setColorCursor(color(26, 26, 26))

‎OpenBCI_GUI/ControlPanel.pde‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1006,7 +1006,7 @@ class WifiBox {
10061006
.setFocus(false)
10071007
.setColor(color(26, 26, 26))
10081008
.setColorBackground(color(255, 255, 255)) // text field bg color
1009-
.setColorValueLabel(color(0, 0, 0)) // text color
1009+
.setColorValueLabel(OPENBCI_DARKBLUE) // text color
10101010
.setColorForeground(isSelected_color) // border color when not selected
10111011
.setColorActive(isSelected_color) // border color when selected
10121012
.setColorCursor(color(26, 26, 26))
@@ -1302,7 +1302,7 @@ class SessionDataBox {
13021302
.setFocus(false)
13031303
.setColor(color(26, 26, 26))
13041304
.setColorBackground(color(255, 255, 255)) // text field bg color
1305-
.setColorValueLabel(color(0, 0, 0)) // text color
1305+
.setColorValueLabel(OPENBCI_DARKBLUE) // text color
13061306
.setColorForeground(isSelected_color) // border color when not selected
13071307
.setColorActive(isSelected_color) // border color when selected
13081308
.setColorCursor(color(26, 26, 26))
@@ -1340,7 +1340,7 @@ class SessionDataBox {
13401340
.setColor(settings.dropdownColors)
13411341
.setOutlineColor(150)
13421342
//.setColorBackground(color(31,69,110)) // text field bg color
1343-
//.setColorValueLabel(color(0)) // text color
1343+
.setColorValueLabel(OPENBCI_DARKBLUE) // text color
13441344
//.setColorCaptionLabel(color(255))
13451345
//.setColorForeground(color(125)) // border color when not selected
13461346
//.setColorActive(BUTTON_PRESSED) // border color when selected
@@ -2104,7 +2104,7 @@ class GaleaBox {
21042104
.setFocus(false)
21052105
.setColor(color(26, 26, 26))
21062106
.setColorBackground(color(255, 255, 255)) // text field bg color
2107-
.setColorValueLabel(color(0, 0, 0)) // text color
2107+
.setColorValueLabel(OPENBCI_DARKBLUE) // text color
21082108
.setColorForeground(isSelected_color) // border color when not selected
21092109
.setColorActive(isSelected_color) // border color when selected
21102110
.setColorCursor(color(26, 26, 26))
@@ -2303,7 +2303,7 @@ class BrainFlowStreamerBox {
23032303
.setFocus(false)
23042304
.setColor(color(26, 26, 26))
23052305
.setColorBackground(color(255, 255, 255)) // text field bg color
2306-
.setColorValueLabel(color(0, 0, 0)) // text color
2306+
.setColorValueLabel(OPENBCI_DARKBLUE) // text color
23072307
.setColorForeground(isSelected_color) // border color when not selected
23082308
.setColorActive(isSelected_color) // border color when selected
23092309
.setColorCursor(color(26, 26, 26))
@@ -2334,7 +2334,7 @@ class BrainFlowStreamerBox {
23342334
.setFocus(false)
23352335
.setColor(color(26, 26, 26))
23362336
.setColorBackground(color(255, 255, 255)) // text field bg color
2337-
.setColorValueLabel(color(0, 0, 0)) // text color
2337+
.setColorValueLabel(OPENBCI_DARKBLUE) // text color
23382338
.setColorForeground(isSelected_color) // border color when not selected
23392339
.setColorActive(isSelected_color) // border color when selected
23402340
.setColorCursor(color(26, 26, 26))
@@ -2534,7 +2534,7 @@ class StreamingBoardBox {
25342534
.setFocus(false)
25352535
.setColor(color(26, 26, 26))
25362536
.setColorBackground(color(255, 255, 255)) // text field bg color
2537-
.setColorValueLabel(color(0, 0, 0)) // text color
2537+
.setColorValueLabel(OPENBCI_DARKBLUE) // text color
25382538
.setColorForeground(isSelected_color) // border color when not selected
25392539
.setColorActive(isSelected_color) // border color when selected
25402540
.setColorCursor(color(26, 26, 26))
@@ -2551,7 +2551,7 @@ class StreamingBoardBox {
25512551
.setFocus(false)
25522552
.setColor(color(26, 26, 26))
25532553
.setColorBackground(color(255, 255, 255)) // text field bg color
2554-
.setColorValueLabel(color(0, 0, 0)) // text color
2554+
.setColorValueLabel(OPENBCI_DARKBLUE) // text color
25552555
.setColorForeground(isSelected_color) // border color when not selected
25562556
.setColorActive(isSelected_color) // border color when selected
25572557
.setColorCursor(color(26, 26, 26))

‎OpenBCI_GUI/Extras.pde‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ class TextBox {
502502

503503
TextBox(String s, int x1, int y1) {
504504
string = s; x = x1; y = y1;
505-
textColor = color(0);
505+
textColor = OPENBCI_DARKBLUE;
506506
backgroundColor = color(255);
507507
fontSize = 12;
508508
font = p5;

‎OpenBCI_GUI/FilterUI.pde‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ class FilterUIPopup extends PApplet implements Runnable {
551551
.setFocus(false)
552552
.setColor(color(26, 26, 26))
553553
.setColorBackground(color(255, 255, 255)) // text field bg color
554-
.setColorValueLabel(BLACK) // text color
554+
.setColorValueLabel(OPENBCI_DARKBLUE) // text color
555555
.setColorForeground(color(210)) // border color when not selected - grey
556556
.setColorActive(isSelected_color) // border color when selected - green
557557
.setColorCursor(color(26, 26, 26))
@@ -795,8 +795,8 @@ class FilterUIPopup extends PApplet implements Runnable {
795795
.setPosition(_x, _y)
796796
.setOpen(false)
797797
.setColorBackground(WHITE) // text field bg color
798-
.setColorValueLabel(color(0)) // text color
799-
.setColorCaptionLabel(color(0))
798+
.setColorValueLabel(OPENBCI_DARKBLUE) // text color
799+
.setColorCaptionLabel(OPENBCI_DARKBLUE)
800800
.setColorForeground(color(125)) // border color when not selected
801801
.setColorActive(BUTTON_PRESSED) // border color when selected
802802
.setOutlineColor(OBJECT_BORDER_GREY)

‎OpenBCI_GUI/OpenBCI_GUI.pde‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,12 @@ void setup() {
346346

347347
//V1 FONTS
348348
f1 = createFont("fonts/Raleway-SemiBold.otf", 16);
349-
f2 = createFont("fonts/Raleway-Regular.otf", 15);
349+
if (isMac()) {
350+
f2 = createFont("Arial", 15, true);
351+
} else {
352+
f2 = createFont("fonts/Raleway-Regular.otf", 15);
353+
}
354+
350355
f3 = createFont("fonts/Raleway-SemiBold.otf", 15);
351356
f4 = createFont("fonts/Raleway-SemiBold.otf", 64); // clear bigger fonts for widgets
352357

‎OpenBCI_GUI/SignalCheckThresholds.pde‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class SignalCheckThresholdUI {
88
private int valuePercentage;
99
private int valuekOhms;
1010
private CytonSignalCheckMode signalCheckMode;
11-
private color textColor = color(0);
11+
private color textColor = OPENBCI_DARKBLUE;
1212
private boolean hasUpdatedTextColor = false;
1313

1414
SignalCheckThresholdUI(ControlP5 _cp5, String _name, int _x, int _y, int _w, int _h, color _textColor, CytonSignalCheckMode _mode) {

‎OpenBCI_GUI/W_Accelerometer.pde‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class W_Accelerometer extends Widget {
1515
//To see all core variables/methods of the Widget class, refer to Widget.pde
1616
color graphStroke = color(210);
1717
color graphBG = color(245);
18-
color textColor = color(0);
18+
color textColor = OPENBCI_DARKBLUE;
1919
color strokeColor = color(138, 146, 153);
2020
color eggshell = color(255, 253, 248);
2121

‎OpenBCI_GUI/W_Networking.pde‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ class W_Networking extends Widget {
500500
.setFocus(false) // Deselects textfield
501501
.setColor(color(26,26,26))
502502
.setColorBackground(color(255,255,255)) // text field bg color
503-
.setColorValueLabel(color(0,0,0)) // text color
503+
.setColorValueLabel(OPENBCI_DARKBLUE) // text color
504504
.setColorForeground(color(26,26,26)) // border color when not selected
505505
.setColorActive(isSelected_color) // border color when selected
506506
.setColorCursor(color(26,26,26))
@@ -519,7 +519,7 @@ class W_Networking extends Widget {
519519
.setColorForeground(color(120))
520520
.setColorBackground(color(200,200,200)) // text field bg color
521521
.setColorActive(TURN_ON_GREEN)
522-
.setColorLabel(color(0))
522+
.setColorLabel(OPENBCI_DARKBLUE)
523523
.setVisible(false)
524524
;
525525
myToggle
@@ -535,7 +535,7 @@ class W_Networking extends Widget {
535535
}
536536

537537
void createStartButton() {
538-
startButton = createButton(cp5_networking, "startStopNetworkStream", "Start "+protocolMode+" Stream", x + w/2 - 70, y+h-40, 200, 20, 0, p4, 14, TURN_ON_GREEN, BLACK, BUTTON_HOVER, BUTTON_PRESSED, OBJECT_BORDER_GREY, 0);
538+
startButton = createButton(cp5_networking, "startStopNetworkStream", "Start "+protocolMode+" Stream", x + w/2 - 70, y+h-40, 200, 20, 0, p4, 14, TURN_ON_GREEN, OPENBCI_DARKBLUE, BUTTON_HOVER, BUTTON_PRESSED, OBJECT_BORDER_GREY, 0);
539539
startButton.onRelease(new CallbackListener() {
540540
public void controlEvent(CallbackEvent theEvent) {
541541
if (!networkActive) {
@@ -599,7 +599,7 @@ class W_Networking extends Widget {
599599

600600
ScrollableList scrollList = cp5_networking_dropdowns.addScrollableList(name)
601601
.setOpen(false)
602-
.setOutlineColor(color(0))
602+
.setOutlineColor(OPENBCI_DARKBLUE)
603603
.setColorBackground(color(31,69,110)) // text field bg color
604604
.setColorValueLabel(color(255)) // text color
605605
.setColorCaptionLabel(color(255))
@@ -636,7 +636,7 @@ class W_Networking extends Widget {
636636
void createBaudDropdown(String name, List<String> _items) {
637637
ScrollableList scrollList = cp5_networking_baudRate.addScrollableList(name)
638638
.setOpen(false)
639-
.setOutlineColor(color(0))
639+
.setOutlineColor(OPENBCI_DARKBLUE)
640640
.setColorBackground(color(31,69,110)) // text field bg color
641641
.setColorValueLabel(color(255)) // text color
642642
.setColorCaptionLabel(color(255))
@@ -674,7 +674,7 @@ class W_Networking extends Widget {
674674
if (isEmpty) _items.add("None"); // Fix #642 and #637
675675
ScrollableList scrollList = cp5_networking_portName.addScrollableList(name)
676676
.setOpen(false)
677-
.setOutlineColor(color(0))
677+
.setOutlineColor(OPENBCI_DARKBLUE)
678678
.setColorBackground(color(31,69,110)) // text field bg color
679679
.setColorValueLabel(color(255)) // text color
680680
.setColorCaptionLabel(color(255))

‎release_script/windows_only/gui.manifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
1111
<security>
1212
<requestedPrivileges>
13-
<requestedExecutionLevel level="HighestAvailable" uiAccess="false"></requestedExecutionLevel>
13+
<requestedExecutionLevel level="asInvoker" uiAccess="false"></requestedExecutionLevel>
1414
</requestedPrivileges>
1515
</security>
1616
</trustInfo>

‎release_script/windows_only/java.manifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
1111
<security>
1212
<requestedPrivileges>
13-
<requestedExecutionLevel level="HighestAvailable" uiAccess="false"></requestedExecutionLevel>
13+
<requestedExecutionLevel level="asInvoker" uiAccess="false"></requestedExecutionLevel>
1414
</requestedPrivileges>
1515
</security>
1616
</trustInfo>

0 commit comments

Comments
 (0)