diff --git a/OpenBCI_GUI/OpenBCI_GUI.pde b/OpenBCI_GUI/OpenBCI_GUI.pde index df140670e..c1be8b66c 100644 --- a/OpenBCI_GUI/OpenBCI_GUI.pde +++ b/OpenBCI_GUI/OpenBCI_GUI.pde @@ -196,6 +196,7 @@ PImage cog; Gif loadingGIF; Gif loadingGIF_blue; +PImage logo_black; PImage logo_blue; PImage logo_white; PImage consoleImgBlue; @@ -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()); @@ -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(); diff --git a/OpenBCI_GUI/TopNav.pde b/OpenBCI_GUI/TopNav.pde index c64a2e307..994ecb872 100644 --- a/OpenBCI_GUI/TopNav.pde +++ b/OpenBCI_GUI/TopNav.pde @@ -232,7 +232,7 @@ class TopNav { } else { topNavBg = color(255); subNavBg = color(229); - logo = logo_blue; + logo = logo_black; } if (eegDataSource == DATASOURCE_GALEA) { @@ -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 diff --git a/OpenBCI_GUI/data/obci-logo-blk.png b/OpenBCI_GUI/data/obci-logo-blk.png new file mode 100644 index 000000000..f0561e91d Binary files /dev/null and b/OpenBCI_GUI/data/obci-logo-blk.png differ diff --git a/OpenBCI_GUI/data/obci-logo-blu-cog.png b/OpenBCI_GUI/data/obci-logo-blu-cog.png new file mode 100644 index 000000000..b08f756b6 Binary files /dev/null and b/OpenBCI_GUI/data/obci-logo-blu-cog.png differ diff --git a/OpenBCI_GUI/data/obci-logo-blu.png b/OpenBCI_GUI/data/obci-logo-blu.png new file mode 100644 index 000000000..59f5ff2f7 Binary files /dev/null and b/OpenBCI_GUI/data/obci-logo-blu.png differ diff --git a/OpenBCI_GUI/data/obci-logo-wht.png b/OpenBCI_GUI/data/obci-logo-wht.png new file mode 100644 index 000000000..7c4df2f06 Binary files /dev/null and b/OpenBCI_GUI/data/obci-logo-wht.png differ diff --git a/OpenBCI_GUI/data/obci_cog_anim-darkblue.gif b/OpenBCI_GUI/data/obci_cog_anim-darkblue.gif new file mode 100644 index 000000000..58b8c1129 Binary files /dev/null and b/OpenBCI_GUI/data/obci_cog_anim-darkblue.gif differ diff --git a/OpenBCI_GUI/data/obci_cog_anim-normalblue.gif b/OpenBCI_GUI/data/obci_cog_anim-normalblue.gif new file mode 100644 index 000000000..25b3c3a6a Binary files /dev/null and b/OpenBCI_GUI/data/obci_cog_anim-normalblue.gif differ