Skip to content

Commit b65552a

Browse files
retiututretiutut
committed
Update colors and display of all GPlot graphs
1 parent cba958f commit b65552a

6 files changed

Lines changed: 44 additions & 12 deletions

File tree

‎OpenBCI_GUI/W_Accelerometer.pde‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,9 +355,16 @@ class AccelerometerBar {
355355
plot.setPointColor(0);
356356
plot.getXAxis().setAxisLabelText("Time (s)");
357357
plot.getYAxis().setAxisLabelText("Acceleration (g)");
358+
plot.getYAxis().setNTicks(3);
358359
plot.setAllFontProperties("Arial", 0, 14);
359360
plot.getXAxis().getAxisLabel().setOffset(float(accBarPadding));
360361
plot.getYAxis().getAxisLabel().setOffset(float(accBarPadding));
362+
plot.getXAxis().setFontColor(OPENBCI_DARKBLUE);
363+
plot.getXAxis().setLineColor(OPENBCI_DARKBLUE);
364+
plot.getXAxis().getAxisLabel().setFontColor(OPENBCI_DARKBLUE);
365+
plot.getYAxis().setFontColor(OPENBCI_DARKBLUE);
366+
plot.getYAxis().setLineColor(OPENBCI_DARKBLUE);
367+
plot.getYAxis().getAxisLabel().setFontColor(OPENBCI_DARKBLUE);
361368

362369
initArrays();
363370

@@ -402,12 +409,11 @@ class AccelerometerBar {
402409
pushStyle();
403410
plot.beginDraw();
404411
plot.drawBox(); //we won't draw this eventually ...
405-
plot.drawGridLines(2);
412+
plot.drawGridLines(GPlot.BOTH);
406413
plot.drawLines(); //Draw a Line graph!
407414
//plot.drawPoints(); //Used to draw Points instead of Lines
408415
plot.drawYAxis();
409416
plot.drawXAxis();
410-
plot.getXAxis().draw();
411417
plot.endDraw();
412418
popStyle();
413419
}

‎OpenBCI_GUI/W_AnalogRead.pde‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,9 @@ class AnalogReadBar{
290290
plot.setPointSize(2);
291291
plot.setPointColor(0);
292292
plot.setAllFontProperties("Arial", 0, 14);
293+
plot.getXAxis().setFontColor(OPENBCI_DARKBLUE);
294+
plot.getXAxis().setLineColor(OPENBCI_DARKBLUE);
295+
plot.getXAxis().getAxisLabel().setFontColor(OPENBCI_DARKBLUE);
293296
if (selectedProtocol == BoardProtocol.WIFI) {
294297
if(auxValuesPosition == 1) {
295298
plot.getXAxis().setAxisLabelText("Time (s)");
@@ -397,7 +400,7 @@ class AnalogReadBar{
397400

398401
plot.beginDraw();
399402
plot.drawBox(); // we won't draw this eventually ...
400-
plot.drawGridLines(0);
403+
plot.drawGridLines(GPlot.VERTICAL);
401404
plot.drawLines();
402405
if (selectedProtocol == BoardProtocol.WIFI) {
403406
if(auxValuesPosition == 1) { //only draw the x axis label on the bottom channel bar

‎OpenBCI_GUI/W_BandPower.pde‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,22 +63,29 @@ class W_BandPower extends Widget {
6363
bp_plot.getXAxis().getAxisLabel().setOffset(42f);
6464
bp_plot.startHistograms(GPlot.VERTICAL);
6565
bp_plot.getHistogram().setDrawLabels(true);
66+
bp_plot.getXAxis().setFontColor(OPENBCI_DARKBLUE);
67+
bp_plot.getXAxis().setLineColor(OPENBCI_DARKBLUE);
68+
bp_plot.getXAxis().getAxisLabel().setFontColor(OPENBCI_DARKBLUE);
69+
bp_plot.getYAxis().setFontColor(OPENBCI_DARKBLUE);
70+
bp_plot.getYAxis().setLineColor(OPENBCI_DARKBLUE);
71+
bp_plot.getYAxis().getAxisLabel().setFontColor(OPENBCI_DARKBLUE);
6672

6773
//setting border of histograms to match BG
6874
bp_plot.getHistogram().setLineColors(new color[]{
6975
color(245), color(245), color(245), color(245), color(245)
7076
}
7177
);
72-
7378
//setting bg colors of histogram bars to match the color scheme of the channel colors w/ an opacity of 150/255
7479
bp_plot.getHistogram().setBgColors(new color[] {
75-
color((int)channelColors[6], 150),
76-
color((int)channelColors[4], 150),
77-
color((int)channelColors[3], 150),
78-
color((int)channelColors[2], 150),
79-
color((int)channelColors[1], 150),
80+
color((int)channelColors[6], 200),
81+
color((int)channelColors[4], 200),
82+
color((int)channelColors[3], 200),
83+
color((int)channelColors[2], 200),
84+
color((int)channelColors[1], 200),
8085
}
8186
);
87+
//setting color of text label for each histogram bar on the x axis
88+
bp_plot.getHistogram().setFontColor(OPENBCI_DARKBLUE);
8289
} //end of constructor
8390

8491
void update() {
@@ -136,6 +143,7 @@ class W_BandPower extends Widget {
136143
bp_plot.drawBox();
137144
bp_plot.drawXAxis();
138145
bp_plot.drawYAxis();
146+
bp_plot.drawGridLines(GPlot.HORIZONTAL);
139147
bp_plot.drawHistograms();
140148
bp_plot.endDraw();
141149

‎OpenBCI_GUI/W_FFT.pde‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,12 @@ class W_fft extends Widget {
9494
fft_plot.getYAxis().setDrawTickLabels(true);
9595
fft_plot.setPointSize(2);
9696
fft_plot.setPointColor(0);
97+
fft_plot.getXAxis().setFontColor(OPENBCI_DARKBLUE);
98+
fft_plot.getXAxis().setLineColor(OPENBCI_DARKBLUE);
99+
fft_plot.getXAxis().getAxisLabel().setFontColor(OPENBCI_DARKBLUE);
100+
fft_plot.getYAxis().setFontColor(OPENBCI_DARKBLUE);
101+
fft_plot.getYAxis().setLineColor(OPENBCI_DARKBLUE);
102+
fft_plot.getYAxis().getAxisLabel().setFontColor(OPENBCI_DARKBLUE);
97103

98104
//setup points of fft point arrays
99105
for (int i = 0; i < fft_points.length; i++) {
@@ -153,7 +159,7 @@ class W_fft extends Widget {
153159
fft_plot.drawBox();
154160
fft_plot.drawXAxis();
155161
fft_plot.drawYAxis();
156-
fft_plot.drawGridLines(2);
162+
fft_plot.drawGridLines(GPlot.BOTH);
157163
//Update and draw active channels that have been selected via channel select for this widget
158164
for (int j = 0; j < fftChanSelect.activeChan.size(); j++) {
159165
int chan = fftChanSelect.activeChan.get(j);

‎OpenBCI_GUI/W_Focus.pde‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,6 +471,12 @@ class FocusBar {
471471
plot.setAllFontProperties("Arial", 0, 14);
472472
plot.getXAxis().getAxisLabel().setOffset(float(22));
473473
plot.getYAxis().getAxisLabel().setOffset(float(focusBarPadding));
474+
plot.getXAxis().setFontColor(OPENBCI_DARKBLUE);
475+
plot.getXAxis().setLineColor(OPENBCI_DARKBLUE);
476+
plot.getXAxis().getAxisLabel().setFontColor(OPENBCI_DARKBLUE);
477+
plot.getYAxis().setFontColor(OPENBCI_DARKBLUE);
478+
plot.getYAxis().setLineColor(OPENBCI_DARKBLUE);
479+
plot.getYAxis().getAxisLabel().setFontColor(OPENBCI_DARKBLUE);
474480

475481
adjustTimeAxis(numSeconds);
476482

@@ -497,7 +503,7 @@ class FocusBar {
497503
public void draw() {
498504
plot.beginDraw();
499505
plot.drawBox(); //we won't draw this eventually ...
500-
plot.drawGridLines(2);
506+
plot.drawGridLines(GPlot.BOTH);
501507
plot.drawLines(); //Draw a Line graph!
502508
//plot.drawPoints(); //Used to draw Points instead of Lines
503509
plot.drawYAxis();

‎OpenBCI_GUI/W_TimeSeries.pde‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -522,6 +522,9 @@ class ChannelBar {
522522
plot.setPointSize(2);
523523
plot.setPointColor(0);
524524
plot.setAllFontProperties("Arial", 0, 14);
525+
plot.getXAxis().setFontColor(OPENBCI_DARKBLUE);
526+
plot.getXAxis().setLineColor(OPENBCI_DARKBLUE);
527+
plot.getXAxis().getAxisLabel().setFontColor(OPENBCI_DARKBLUE);
525528
if(channelIndex == nchan-1) {
526529
plot.getXAxis().setAxisLabelText("Time (s)");
527530
plot.getXAxis().getAxisLabel().setOffset(plotBottomWellH/2 + 5f);
@@ -627,7 +630,7 @@ class ChannelBar {
627630

628631
plot.beginDraw();
629632
plot.drawBox();
630-
plot.drawGridLines(0);
633+
plot.drawGridLines(GPlot.VERTICAL);
631634
try {
632635
plot.drawLines();
633636
} catch (NullPointerException e) {

0 commit comments

Comments
 (0)