Skip to content

Commit b69fc60

Browse files
committed
Code Review - Looking at fonts on mac
1 parent 3e8be4c commit b69fc60

4 files changed

Lines changed: 11 additions & 12 deletions

File tree

OpenBCI_GUI/ADS1299SettingsController.pde

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ class ADS1299SettingsController {
387387
.setPosition(0, 0)
388388
.setCaptionLabel("")
389389
.setSize(120, 20)
390-
.setFont(createFont("Arial", 15, true))
390+
.setFont(f2)
391391
.setFocus(false)
392392
.setColor(color(26, 26, 26))
393393
.setColorBackground(color(255, 255, 255)) // text field bg color

OpenBCI_GUI/ControlPanel.pde

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1002,7 +1002,7 @@ class WifiBox {
10021002
.setPosition(x + 90, y + 100)
10031003
.setCaptionLabel("")
10041004
.setSize(w - padding*2, 26)
1005-
.setFont(createFont("Arial", 15, true))
1005+
.setFont(f2)
10061006
.setFocus(false)
10071007
.setColor(color(26, 26, 26))
10081008
.setColorBackground(color(255, 255, 255)) // text field bg color
@@ -1298,7 +1298,7 @@ class SessionDataBox {
12981298
.setPosition(x + 60, y + 32)
12991299
.setCaptionLabel("")
13001300
.setSize(187, 26)
1301-
.setFont(createFont("Arial", 15, true))
1301+
.setFont(f2)
13021302
.setFocus(false)
13031303
.setColor(color(26, 26, 26))
13041304
.setColorBackground(color(255, 255, 255)) // text field bg color
@@ -2100,7 +2100,7 @@ class GaleaBox {
21002100
.setPosition(x + w - padding*2 - 60*2, y + 16 + padding*2)
21012101
.setCaptionLabel("")
21022102
.setSize(120 + padding, 26)
2103-
.setFont(createFont("Arial", 15, true))
2103+
.setFont(f2)
21042104
.setFocus(false)
21052105
.setColor(color(26, 26, 26))
21062106
.setColorBackground(color(255, 255, 255)) // text field bg color
@@ -2299,7 +2299,7 @@ class BrainFlowStreamerBox {
22992299
.setPosition(x + padding * 3, y + HEADER_H + padding*2)
23002300
.setCaptionLabel("")
23012301
.setSize(120, OBJECT_H)
2302-
.setFont(createFont("Arial", 15, true))
2302+
.setFont(f2)
23032303
.setFocus(false)
23042304
.setColor(color(26, 26, 26))
23052305
.setColorBackground(color(255, 255, 255)) // text field bg color
@@ -2330,7 +2330,7 @@ class BrainFlowStreamerBox {
23302330
.setPosition(x + padding*5 + w/2, y + HEADER_H + padding*2)
23312331
.setCaptionLabel("")
23322332
.setSize(50, OBJECT_H)
2333-
.setFont(createFont("Arial", 15, true))
2333+
.setFont(f2)
23342334
.setFocus(false)
23352335
.setColor(color(26, 26, 26))
23362336
.setColorBackground(color(255, 255, 255)) // text field bg color
@@ -2530,7 +2530,7 @@ class StreamingBoardBox {
25302530
.setPosition(x + padding * 3, y + headerH + padding*2)
25312531
.setCaptionLabel("")
25322532
.setSize(w / 3, objectH)
2533-
.setFont(createFont("Arial", 15, true))
2533+
.setFont(f2)
25342534
.setFocus(false)
25352535
.setColor(color(26, 26, 26))
25362536
.setColorBackground(color(255, 255, 255)) // text field bg color
@@ -2547,7 +2547,7 @@ class StreamingBoardBox {
25472547
.setPosition(x + padding*5 + w/2, y + headerH + padding*2)
25482548
.setCaptionLabel("")
25492549
.setSize(w / 5 + padding, objectH)
2550-
.setFont(createFont("Arial", 15, true))
2550+
.setFont(f2)
25512551
.setFocus(false)
25522552
.setColor(color(26, 26, 26))
25532553
.setColorBackground(color(255, 255, 255)) // text field bg color

OpenBCI_GUI/Debugging.pde

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,8 @@ class HelpWidget {
109109
outputWasTriggered = false;
110110
}
111111
}
112-
// Color mode is switched to Hue, Saturation, Brightness in the next line
112+
//Colors in this method are calculated using Hue, Saturation, Brightness
113+
colorMode(HSB, 360, 100, 100);
113114
color c = getBackgroundColor(saturationFadeValue);
114115
stroke(c);
115116
fill(c);
@@ -144,8 +145,6 @@ class HelpWidget {
144145
}
145146

146147
private color getBackgroundColor(int fadeVal) {
147-
//Colors in this method are calculated using Hue, Saturation, Brightness
148-
colorMode(HSB, 360, 100, 100);
149148
int sat = 0;
150149
int maxSat = 75;
151150
switch (curOutputLevel) {

OpenBCI_GUI/W_Networking.pde

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ class W_Networking extends Widget {
496496
cp5_networking.addTextfield(name)
497497
.align(10,100,10,100) // Alignment
498498
.setSize(120,20) // Size of textfield
499-
.setFont(createFont("Arial", 15, true))
499+
.setFont(f2)
500500
.setFocus(false) // Deselects textfield
501501
.setColor(OPENBCI_DARKBLUE)
502502
.setColorBackground(color(255,255,255)) // text field bg color

0 commit comments

Comments
 (0)