Swap Black for OpenBCI Dark Blue - Second pass

Author: retiutut

OpenBCI_GUI/ADS1299SettingsController.pde

@@ -104,14 +104,14 @@ class ADS1299SettingsController {
             pushStyle();
             //stroke(31,69,110, 50);
             stroke(OBJECT_BORDER_GREY);
-            fill(0, 0, 0, 100);
+            fill(GREY_100);
             rect(x, y - columnLabelH, w, columnLabelH);
             popStyle();
 
             //background
             pushStyle();
             noStroke();
-            fill(0, 0, 0, 100);
+            fill(GREY_100);
             rect(x, y, w + 1, h);
             popStyle();
 
@@ -142,7 +142,7 @@ class ADS1299SettingsController {
 
             //Draw background behind command buttons
             pushStyle();
-            fill(0, 0, 0, 100);
+            fill(GREY_100);
             rect(x, y + h, w + 1, commandBarH);
             if (showCustomCommandUI) {
                 rect(customCmdUI_x, y + h + commandBarH, customCmdUI_w, commandBarH); //keep above style for other command buttons

OpenBCI_GUI/Grid.pde

@@ -41,7 +41,7 @@ class Grid {
     public void draw() {
         pushStyle();
         textAlign(LEFT);        
-        stroke(0);
+        stroke(OPENBCI_DARKBLUE);
         textFont(p5, 12);
 
         if (drawTableInnerLines) {
@@ -69,7 +69,7 @@ class Grid {
 
         if (drawTableBorder) {
             noFill();
-            stroke(0);
+            stroke(OPENBCI_DARKBLUE);
             rect(x, y, w, rowOffset[numRows - 1]);
         }
 

OpenBCI_GUI/OpenBCI_GUI.pde

@@ -226,16 +226,19 @@ PFont p6; //small Open Sans
 boolean setupComplete = false;
 
 //Starting to collect the GUI-wide color pallet here. Rename constants all caps later...
+final color WHITE = color(255);
+final color BLACK = color(0);
 final color OPENBCI_DARKBLUE = color(1, 18, 41);
 final color OPENBCI_BLUE = color(31, 69, 110);
 final color boxColor = color(200);
 final color boxStrokeColor = OPENBCI_DARKBLUE;
 final color isSelected_color = color(184, 220, 105);
-final color colorNotPressed = color(255);
+final color colorNotPressed = WHITE;
 final color buttonsLightBlue = color(57,128,204);
+final color GREY_125 = color(125);
+final color GREY_100 = color(100);
+final color GREY_20 = color(20);
 final color TURN_ON_GREEN = color(184,220,105);
-final color WHITE = color(255);
-final color BLACK = color(0);
 final color TURN_OFF_RED = color(224, 56, 45);
 final color BUTTON_HOVER = color(177, 184, 193);//color(252, 221, 198);
 final color BUTTON_HOVER_LIGHT = color(211, 222, 232);

OpenBCI_GUI/W_DigitalRead.pde

@@ -12,7 +12,8 @@ class W_DigitalRead extends Widget {
     private int numDigitalReadDots;
     float xF, yF, wF, hF;
     int dot_padding;
-    float dot_x, dot_y, dot_h, dot_w; //values for actual time series chart (rectangle encompassing all digitalReadDots)
+    //values for actual time series chart (rectangle encompassing all digitalReadDots)
+    float dot_x, dot_y, dot_h, dot_w;
     float plotBottomWell;
     float playbackWidgetHeight;
     int digitalReaddotHeight;
@@ -218,8 +219,8 @@ class DigitalReadDot{
     color dotStroke = #d2d2d2;
     color dot0Fill = #f5f5f5;
     color dot1Fill = #f5f5f5;
-    color val0Fill = #000000;
-    color val1Fill = #ffffff;
+    color val0Fill = OPENBCI_DARKBLUE;
+    color val1Fill = WHITE;
 
     int dotX;
     int dotY;
@@ -256,7 +257,7 @@ class DigitalReadDot{
         padding = _padding;
 
         digitalValue = new TextBox("", dotX, dotY);
-        digitalValue.textColor = color(val0Fill);
+        digitalValue.textColor = val0Fill;
         digitalValue.alignH = CENTER;
         digitalValue.alignV = CENTER;
         drawDigitalValue = true;

OpenBCI_GUI/W_EMG.pde

@@ -239,7 +239,7 @@ class W_emg extends Widget {
 
                 //draw channel number at upper left corner of row/column cell
                 pushStyle();
-                stroke(0);
+                stroke(OPENBCI_DARKBLUE);
                 fill(OPENBCI_DARKBLUE);
                 int _chan = index+1;
                 textFont(p5, 12);

OpenBCI_GUI/W_Focus.pde

@@ -152,7 +152,7 @@ class W_Focus extends Widget {
         if (false) {
             //Draw some guides to help develop this widget faster
             pushStyle();
-            stroke(0);
+            stroke(OPENBCI_DARKBLUE);
             //Main guides
             line(x, y+(h/2), x+w, y+(h/2));
             line(x+(w/2), y, x+(w/2), y+(h/2));

OpenBCI_GUI/W_HeadPlot.pde

@@ -324,7 +324,7 @@ class HeadPlot {
         //initialize the image
         for (int Iy=0; Iy < headImage.height; Iy++) {
             for (int Ix = 0; Ix < headImage.width; Ix++) {
-                headImage.set(Ix, Iy, OPENBCI_DARKBLUE);
+                headImage.set(Ix, Iy, WHITE);
             }
         }
 
@@ -992,7 +992,7 @@ class HeadPlot {
                     headImage.set(Ix, Iy, calcPixelColor(Ix, Iy));
                 } else {  //negative values are outside of the head
                     //pixel is outside the head.  set to black.
-                    headImage.set(Ix, Iy, OPENBCI_DARKBLUE);
+                    headImage.set(Ix, Iy, WHITE);
                 }
             }
         }
@@ -1004,32 +1004,17 @@ class HeadPlot {
                 //is this pixel inside the head?
                 if (electrode_color_weightFac[0][Ix][Iy] >= 0.0) { //zero and positive values are inside the head
                     //it is inside the head.  set the color based on the electrodes
+                    headVoltage[Ix][Iy] = calcPixelVoltage(Ix, Iy, headVoltage[Ix][Iy]);
                     headImage.set(Ix, Iy, calcPixelColor(headVoltage[Ix][Iy]));
                 } else {  //negative values are outside of the head
                     //pixel is outside the head.  set to black.
-                    headImage.set(Ix, Iy, OPENBCI_DARKBLUE);
-                }
-            }
-        }
-    }
-
-
-    private void updateHeadVoltages() {
-        for (int Iy=0; Iy < headImage.height; Iy++) {
-            for (int Ix = 0; Ix < headImage.width; Ix++) {
-                //is this pixel inside the head?
-                if (electrode_color_weightFac[0][Ix][Iy] >= 0.0) { //zero and positive values are inside the head
-                    //it is inside the head.  set the voltage based on the electrodes
-                    headVoltage[Ix][Iy] = calcPixelVoltage(Ix, Iy, headVoltage[Ix][Iy]);
-                } else {  //negative values are outside of the head
-                    //pixel is outside the head.
                     headVoltage[Ix][Iy] = -1.0;
+                    headImage.set(Ix, Iy, WHITE);
                 }
             }
         }
     }
 
-    int count_call=0;
     private float calcPixelVoltage(int pixel_Ix, int pixel_Iy, float prev_val) {
         float weight, elec_volt;
         int n_elec = electrode_xy.length;
@@ -1225,7 +1210,6 @@ class HeadPlot {
         } else {
             //update head voltages
             if (!threadLock && hardCalcsDone) {
-                updateHeadVoltages();
                 convertVoltagesToHeadImage();
             }
         }
@@ -1240,14 +1224,14 @@ class HeadPlot {
         pushStyle();
         smooth();
         //draw head parts
-        fill(255, 255, 255);
-        stroke(125, 125, 125);
+        fill(WHITE);
+        stroke(GREY_125);
         triangle(nose_x[0], nose_y[0], nose_x[1], nose_y[1], nose_x[2], nose_y[2]);  //nose
         ellipse(earL_x, earL_y, ear_width, ear_height); //little circle for the ear
         ellipse(earR_x, earR_y, ear_width, ear_height); //little circle for the ear
 
         //draw head itself
-        fill(255, 255, 255, 255);  //fill in a white head
+        fill(WHITE);  //fill in a white head
         strokeWeight(1);
         ellipse(circ_x, circ_y, circ_diam, circ_diam); //big circle for the head
         if (drawHeadAsContours) {
@@ -1281,7 +1265,7 @@ class HeadPlot {
         }
 
         //add labels to electrodes
-        fill(0, 0, 0);
+        fill(OPENBCI_DARKBLUE);
         textFont(font);
         textAlign(CENTER, CENTER);
         for (int i=0; i < electrode_xy.length; i++) {

OpenBCI_GUI/W_Networking.pde

@@ -324,7 +324,7 @@ class W_Networking extends Widget {
         cp5_networking_dropdowns.draw();
 
         int headerFontSize = 18;
-        fill(0,0,0);// Background fill: white
+        fill(OPENBCI_DARKBLUE);
         textFont(h1, headerFontSize);
 
         if (!protocolMode.equals("Serial")) {
@@ -498,12 +498,12 @@ class W_Networking extends Widget {
             .setSize(120,20)                         // Size of textfield
             .setFont(createFont("Arial", 15, true))
             .setFocus(false)                        // Deselects textfield
-            .setColor(color(26,26,26))
+            .setColor(OPENBCI_DARKBLUE)
             .setColorBackground(color(255,255,255)) // text field bg color
             .setColorValueLabel(OPENBCI_DARKBLUE)       // text color
-            .setColorForeground(color(26,26,26))    // border color when not selected
+            .setColorForeground(OPENBCI_DARKBLUE)    // border color when not selected
             .setColorActive(isSelected_color)       // border color when selected
-            .setColorCursor(color(26,26,26))
+            .setColorCursor(OPENBCI_DARKBLUE)
             .setText(default_text)                  // Default text in the field
             .setCaptionLabel("")                    // Remove caption label
             .setVisible(false)                      // Initially hidden

OpenBCI_GUI/W_PacketLoss.pde

@@ -134,7 +134,7 @@ class W_PacketLoss extends Widget {
         super.draw(); //calls the parent draw() method of Widget (DON'T REMOVE)
 
         pushStyle();
-        fill(0, 0, 0, 255);
+        fill(OPENBCI_DARKBLUE);
         textFont(p5, 12);
         text("Session length: " + sessionTimeElapsed.toString(), x + padding, y + 15);
         text("Stream length: " + streamTimeElapsed.toString(), x + padding, y + 35);

OpenBCI_GUI/W_TimeSeries.pde

@@ -264,7 +264,7 @@ class W_timeSeries extends Widget {
         //Display playback scrollbar, timeDisplay, or ADSSettingsController depending on data source
         if ((currentBoard instanceof FileBoard) && hasScrollbar) { //you will only ever see the playback widget in Playback Mode ... otherwise not visible
             pushStyle();
-            fill(0,0,0,20);
+            fill(GREY_20);
             stroke(31,69,110);
             rect(xF, ts_y + ts_h + playbackWidgetHeight + 5, wF, playbackWidgetHeight);
             popStyle();
@@ -1023,7 +1023,7 @@ class PlaybackScrollbar {
 
         //select color for playback indicator
         if (over || locked) {
-            fill(0, 0, 0);
+            fill(OPENBCI_DARKBLUE);
         } else {
             fill(102, 102, 102);
         }
@@ -1033,7 +1033,7 @@ class PlaybackScrollbar {
         //draw current timestamp and X of Y Seconds above scrollbar
         int fontSize = 17;
         textFont(p2, fontSize);
-        fill(0);
+        fill(OPENBCI_DARKBLUE);
         float tw = textWidth(currentAbsoluteTimeToDisplay);
         text(currentAbsoluteTimeToDisplay, xpos + swidth - tw, ypos - fontSize - 4);
         text(currentTimeInSecondsToDisplay, xpos, ypos - fontSize - 4);
@@ -1105,7 +1105,7 @@ class TimeDisplay {
         if (!currentAbsoluteTimeToDisplay.equals(null)) {
             int fontSize = 17;
             textFont(p2, fontSize);
-            fill(0);
+            fill(OPENBCI_DARKBLUE);
             float tw = textWidth(currentAbsoluteTimeToDisplay);
             text(currentAbsoluteTimeToDisplay, xpos + swidth - tw, ypos);
             text(streamTimeElapsed.toString(), xpos + 10, ypos);