Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update OpenBCI Logo - December 2021 #1020

Merged
merged 2 commits into from
Dec 8, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions OpenBCI_GUI/OpenBCI_GUI.pde
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ PImage cog;
Gif loadingGIF;
Gif loadingGIF_blue;

PImage logo_black;
PImage logo_blue;
PImage logo_white;
PImage consoleImgBlue;
Expand Down Expand Up @@ -364,7 +365,7 @@ void setup() {
p5 = createFont("fonts/OpenSans-Regular.ttf", 12);
p6 = createFont("fonts/OpenSans-Regular.ttf", 10);

cog = loadImage("cog_1024x1024.png");
cog = loadImage("obci-logo-blu-cog.png");

// check if the current directory is writable
File dummy = new File(sketchPath());
Expand Down Expand Up @@ -438,13 +439,14 @@ void delayedSetup() {
//setup topNav
topNav = new TopNav();

logo_blue = loadImage("logo_blue.png");
logo_white = loadImage("logo_white.png");
logo_black = loadImage("obci-logo-blk.png");
logo_blue = loadImage("obci-logo-blu.png");
logo_white = loadImage("obci-logo-wht.png");
consoleImgBlue = loadImage("console-45x45-dots_blue.png");
consoleImgWhite = loadImage("console-45x45-dots_white.png");
loadingGIF = new Gif(this, "ajax_loader_gray_512.gif");
loadingGIF.loop();
loadingGIF_blue = new Gif(this, "OpenBCI-LoadingGIF-blue-256.gif");
loadingGIF_blue = new Gif(this, "obci_cog_anim-normalblue.gif");
loadingGIF_blue.loop();

prepareExitHandler();
Expand Down
4 changes: 2 additions & 2 deletions OpenBCI_GUI/TopNav.pde
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ class TopNav {
} else {
topNavBg = color(255);
subNavBg = color(229);
logo = logo_blue;
logo = logo_black;
}

if (eegDataSource == DATASOURCE_GALEA) {
Expand All @@ -254,7 +254,7 @@ class TopNav {
//hide the center logo if buttons would overlap it
if (width > 860) {
//this is the center logo
image(logo, width/2 - (128/2) - 2, 6, 128, 22);
image(logo, width/2 - (128/2) - 2, 1, 128, 29);
}

//Draw these buttons during a Session
Expand Down
Binary file added OpenBCI_GUI/data/obci-logo-blk.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added OpenBCI_GUI/data/obci-logo-blu-cog.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added OpenBCI_GUI/data/obci-logo-blu.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added OpenBCI_GUI/data/obci-logo-wht.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added OpenBCI_GUI/data/obci_cog_anim-darkblue.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added OpenBCI_GUI/data/obci_cog_anim-normalblue.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.