Skip to content

Commit 1ffb6d1

Browse files
retiututretiutut
committed
Consolidate Red, Yellow, and Green alert colors across GUI
1 parent 0a545fe commit 1ffb6d1

6 files changed

Lines changed: 24 additions & 23 deletions

File tree

‎OpenBCI_GUI/ControlPanel.pde‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1007,7 +1007,7 @@ class WifiBox {
10071007
.setColor(color(26, 26, 26))
10081008
.setColorBackground(color(255, 255, 255)) // text field bg color
10091009
.setColorValueLabel(OPENBCI_DARKBLUE) // text color
1010-
.setColorForeground(isSelected_color) // border color when not selected
1010+
.setColorForeground(OPENBCI_DARKBLUE) // border color when not selected
10111011
.setColorActive(isSelected_color) // border color when selected
10121012
.setColorCursor(color(26, 26, 26))
10131013
.setText(wifi_ipAddress)
@@ -1303,7 +1303,7 @@ class SessionDataBox {
13031303
.setColor(color(26, 26, 26))
13041304
.setColorBackground(color(255, 255, 255)) // text field bg color
13051305
.setColorValueLabel(OPENBCI_DARKBLUE) // text color
1306-
.setColorForeground(isSelected_color) // border color when not selected
1306+
.setColorForeground(OPENBCI_DARKBLUE) // border color when not selected
13071307
.setColorActive(isSelected_color) // border color when selected
13081308
.setColorCursor(color(26, 26, 26))
13091309
.setText(directoryManager.getFileNameDateTime())
@@ -2105,7 +2105,7 @@ class GaleaBox {
21052105
.setColor(color(26, 26, 26))
21062106
.setColorBackground(color(255, 255, 255)) // text field bg color
21072107
.setColorValueLabel(OPENBCI_DARKBLUE) // text color
2108-
.setColorForeground(isSelected_color) // border color when not selected
2108+
.setColorForeground(OPENBCI_DARKBLUE) // border color when not selected
21092109
.setColorActive(isSelected_color) // border color when selected
21102110
.setColorCursor(color(26, 26, 26))
21112111
.setText(ipAddress)
@@ -2304,7 +2304,7 @@ class BrainFlowStreamerBox {
23042304
.setColor(color(26, 26, 26))
23052305
.setColorBackground(color(255, 255, 255)) // text field bg color
23062306
.setColorValueLabel(OPENBCI_DARKBLUE) // text color
2307-
.setColorForeground(isSelected_color) // border color when not selected
2307+
.setColorForeground(OPENBCI_DARKBLUE) // border color when not selected
23082308
.setColorActive(isSelected_color) // border color when selected
23092309
.setColorCursor(color(26, 26, 26))
23102310
.setText(DEFAULT_IP_ADDRESS) //default ipAddress == ""
@@ -2335,7 +2335,7 @@ class BrainFlowStreamerBox {
23352335
.setColor(color(26, 26, 26))
23362336
.setColorBackground(color(255, 255, 255)) // text field bg color
23372337
.setColorValueLabel(OPENBCI_DARKBLUE) // text color
2338-
.setColorForeground(isSelected_color) // border color when not selected
2338+
.setColorForeground(OPENBCI_DARKBLUE) // border color when not selected
23392339
.setColorActive(isSelected_color) // border color when selected
23402340
.setColorCursor(color(26, 26, 26))
23412341
.setText(DEFAULT_PORT) //default port == 0
@@ -2535,7 +2535,7 @@ class StreamingBoardBox {
25352535
.setColor(color(26, 26, 26))
25362536
.setColorBackground(color(255, 255, 255)) // text field bg color
25372537
.setColorValueLabel(OPENBCI_DARKBLUE) // text color
2538-
.setColorForeground(isSelected_color) // border color when not selected
2538+
.setColorForeground(OPENBCI_DARKBLUE) // border color when not selected
25392539
.setColorActive(isSelected_color) // border color when selected
25402540
.setColorCursor(color(26, 26, 26))
25412541
.setText("") //default ipAddress == ""
@@ -2552,7 +2552,7 @@ class StreamingBoardBox {
25522552
.setColor(color(26, 26, 26))
25532553
.setColorBackground(color(255, 255, 255)) // text field bg color
25542554
.setColorValueLabel(OPENBCI_DARKBLUE) // text color
2555-
.setColorForeground(isSelected_color) // border color when not selected
2555+
.setColorForeground(OPENBCI_DARKBLUE) // border color when not selected
25562556
.setColorActive(isSelected_color) // border color when selected
25572557
.setColorCursor(color(26, 26, 26))
25582558
.setText(Integer.toString(0)) //default port == 0

‎OpenBCI_GUI/Extras.pde‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -446,8 +446,8 @@ class DataStatus {
446446
private double percentage;
447447
public String notificationString;
448448
private final color default_color = OPENBCI_DARKBLUE;
449-
private final color yellow = color(221, 178, 13, 255);
450-
private final color red = TURN_OFF_RED;
449+
private final color yellow = SIGNAL_CHECK_YELLOW;
450+
private final color red = BOLD_RED;
451451
private color colorIndicator = default_color;
452452

453453
DataStatus(double thresh_railed, double thresh_railed_warn) {

‎OpenBCI_GUI/OpenBCI_GUI.pde‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -233,14 +233,15 @@ final color OPENBCI_DARKBLUE = color(1, 18, 41);
233233
final color OPENBCI_BLUE = color(31, 69, 110);
234234
final color boxColor = color(200);
235235
final color boxStrokeColor = OPENBCI_DARKBLUE;
236-
final color isSelected_color = color(184, 220, 105);
236+
final color isSelected_color = color(184, 220, 105); //Used for textfield borders,
237237
final color colorNotPressed = WHITE;
238238
final color buttonsLightBlue = color(57,128,204);
239239
final color GREY_125 = color(125);
240240
final color GREY_100 = color(100);
241241
final color GREY_20 = color(20);
242242
final color TURN_ON_GREEN = color(223, 242, 191);
243-
final color TURN_OFF_RED = color(224, 56, 45);
243+
final color TURN_OFF_RED = color(255, 210, 210);
244+
final color BOLD_RED = color(224, 56, 45);
244245
final color BUTTON_HOVER = color(177, 184, 193);//color(252, 221, 198);
245246
final color BUTTON_HOVER_LIGHT = color(211, 222, 232);
246247
final color BUTTON_PRESSED = color(150, 170, 200); //OPENBCI_DARKBLUE;
@@ -254,13 +255,13 @@ final color OBJECT_BORDER_GREY = color(150);
254255
final color TOPNAV_DARKBLUE = OPENBCI_BLUE;
255256
final color SUBNAV_LIGHTBLUE = buttonsLightBlue;
256257
//Use the same colors for X,Y,Z throughout Accelerometer widget
257-
final color ACCEL_X_COLOR = TURN_OFF_RED;
258+
final color ACCEL_X_COLOR = BOLD_RED;
258259
final color ACCEL_Y_COLOR = color(49, 113, 89);
259260
final color ACCEL_Z_COLOR = color(54, 87, 158);
260261
//Signal check colors
261262
final color SIGNAL_CHECK_YELLOW = color(221, 178, 13); //Same color as yellow channel color found below
262263
final color SIGNAL_CHECK_YELLOW_LOWALPHA = color(221, 178, 13, 150);
263-
final color SIGNAL_CHECK_RED = TURN_OFF_RED;
264+
final color SIGNAL_CHECK_RED = BOLD_RED;
264265
final color SIGNAL_CHECK_RED_LOWALPHA = color(224, 56, 45, 150);
265266

266267

@@ -279,9 +280,9 @@ final color[] channelColors = {
279280
color(124, 75, 141),
280281
color(54, 87, 158),
281282
color(49, 113, 89),
282-
color(221, 178, 13),
283+
SIGNAL_CHECK_YELLOW,
283284
color(253, 94, 52),
284-
TURN_OFF_RED,
285+
BOLD_RED,
285286
color(162, 82, 49)
286287
};
287288

‎OpenBCI_GUI/TopNav.pde‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class TopNav {
8888

8989
if (!secondaryNavInit) {
9090
//Buttons on the left side of the GUI secondary nav bar
91-
createToggleDataStreamButton(stopButton_pressToStart_txt, PAD_3, SUBNAV_BUT_Y, DATASTREAM_BUT_W, SUBNAV_BUT_H, h4, 14, isSelected_color, OPENBCI_DARKBLUE);
91+
createToggleDataStreamButton(stopButton_pressToStart_txt, PAD_3, SUBNAV_BUT_Y, DATASTREAM_BUT_W, SUBNAV_BUT_H, h4, 14, TURN_ON_GREEN, OPENBCI_DARKBLUE);
9292
createFiltersButton("Filters", PAD_3*2 + toggleDataStreamingButton.getWidth(), SUBNAV_BUT_Y, SUBNAV_BUT_W, SUBNAV_BUT_H, h4, 14, SUBNAV_LIGHTBLUE, WHITE);
9393

9494
//Appears at Top Right SubNav while in a Session
@@ -497,7 +497,7 @@ class TopNav {
497497
stopRunning();
498498
if (!currentBoard.isStreaming()) {
499499
toggleDataStreamingButton.getCaptionLabel().setText(stopButton_pressToStart_txt);
500-
toggleDataStreamingButton.setColorBackground(isSelected_color);
500+
toggleDataStreamingButton.setColorBackground(TURN_ON_GREEN);
501501
}
502502
} else { //not running
503503
output("openBCI_GUI: startButton was pressed. Starting data transfer, wait a few seconds.");
@@ -517,7 +517,7 @@ class TopNav {
517517
public void resetStartStopButton() {
518518
if (toggleDataStreamingButton != null) {
519519
toggleDataStreamingButton.getCaptionLabel().setText(stopButton_pressToStart_txt);
520-
toggleDataStreamingButton.setColorBackground(isSelected_color);
520+
toggleDataStreamingButton.setColorBackground(TURN_ON_GREEN);
521521
}
522522
}
523523

‎OpenBCI_GUI/W_FFT.pde‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@ class W_fft extends Widget {
2424
(int)color(124, 75, 141),
2525
(int)color(54, 87, 158),
2626
(int)color(49, 113, 89),
27-
(int)color(221, 178, 13),
27+
(int)SIGNAL_CHECK_YELLOW,
2828
(int)color(253, 94, 52),
29-
(int)TURN_OFF_RED,
29+
(int)BOLD_RED,
3030
(int)color(162, 82, 49),
3131
(int)color(129, 129, 129),
3232
(int)color(124, 75, 141),
3333
(int)color(54, 87, 158),
3434
(int)color(49, 113, 89),
35-
(int)color(221, 178, 13),
35+
(int)SIGNAL_CHECK_YELLOW,
3636
(int)color(253, 94, 52),
37-
(int)TURN_OFF_RED,
37+
(int)BOLD_RED,
3838
(int)color(162, 82, 49)
3939
};
4040

‎OpenBCI_GUI/W_PulseSensor.pde‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class W_PulseSensor extends Widget {
7777

7878
// Pulse Sensor Stuff
7979
eggshell = color(255, 253, 248);
80-
pulseWave = TURN_OFF_RED;
80+
pulseWave = BOLD_RED;
8181

8282
PulseWaveY = new int[PulseBuffSize];
8383
BPMwaveY = new int[BPMbuffSize];

0 commit comments

Comments
 (0)