Merge pull request #1047 from OpenBCI/development

GUI 5.1.0-beta.1

Author: retiutut

.travis.yml

@@ -13,6 +13,7 @@ jobs:
 branches:
   only:
   - master
+  - development
 
 before_install:
 - if [ "$TRAVIS_OS_NAME" = osx ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then openssl aes-256-cbc -K $encrypted_2f5d2771e3cb_key -iv $encrypted_2f5d2771e3cb_iv -in release_script/mac_only/Certificates.p12.enc -out release_script/mac_only/Certificates.p12 -d; fi
@@ -28,16 +29,16 @@ install:
   - mkdir $TRAVIS_BUILD_DIR/temp; cd $TRAVIS_BUILD_DIR/temp
 
 ### ### LINUX ### ###
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then curl -O -L --insecure https://download.processing.org/processing-3.5.3-linux64.tgz                 ;fi
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then tar -xzvf processing-3.5.3-linux64.tgz                                                             ;fi
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then curl -O -L --insecure https://github.com/processing/processing/releases/download/processing-0269-3.5.3/processing-3.5.3-linux64.tgz                 ;fi
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then tar -xzvf processing-3.5.3-linux64.tgz                                                               ;fi
   - if [ "$TRAVIS_OS_NAME" = "linux" ]; then export PATH=$TRAVIS_BUILD_DIR/temp/processing-3.5.3:$PATH                                          ;fi
   # copy libraries to linux location
   - if [ "$TRAVIS_OS_NAME" = "linux" ]; then mkdir -p $HOME/sketchbook/libraries/                                                               ;fi
   - if [ "$TRAVIS_OS_NAME" = "linux" ]; then cp -a $TRAVIS_BUILD_DIR/OpenBCI_GUI/libraries/. $HOME/sketchbook/libraries/                        ;fi
 
 ### ### MAC ### ###
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then curl -O -L --insecure https://download.processing.org/processing-3.5.3-macosx.zip                    ;fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then unzip processing-3.5.3-macosx.zip                                                                    ;fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then curl -O -L --insecure https://github.com/processing/processing/releases/download/processing-0269-3.5.3/processing-3.5.3-macosx.zip                   ;fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then unzip processing-3.5.3-macosx.zip                                                                   ;fi
   # Processing.app must be in this location for processing-java to work
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then mv Processing.app /Applications/Processing.app                                                       ;fi
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export PATH=$TRAVIS_BUILD_DIR/release_script/mac_only:$PATH                                          ;fi

CHANGELOG.md

@@ -1,3 +1,23 @@
+# v5.1.0
+
+### Bug Fixes
+* Stop data stream when no data received after 5 seconds #1011
+* Revisit Ganglion Impedance widget so it behaves like new Cyton Impedance Widget #1021
+* Fix dropdown backgrounds in Networking Widget
+* Update priveleges for Windows users and check if GUI has been run as Administrator
+
+### Improvements
+* Add new FilterUI to allow custom filters per channel #988
+* Add BrainFlow Streamer for File and Network to Control Panel #1007
+* Update to BrainFlow v4.9.0+ and print version to console log #1028
+* Update OpenBCI Logo #1010
+* Clarify Cyton Smoothing feature #1027
+* Set Cyton Smoothing on by default and increase communication with a popup and additional Help button #1026
+* Update help text for various buttons across the GUI to help new and existing users
+* Update Band Power widget and add Average Band Power data type to Networking Widget
+* Update ControlP5 Library to 2.3.3 and change ScrollableList behavior to be more consistent with other front-end libraries
+* Remove old multi-line filter buttons in TopNav that draw incorrectly on some PCs #1013
+
 # v5.0.9
 
 ### Bug Fixes

OpenBCI_GUI/ADS1299SettingsController.pde

@@ -94,7 +94,7 @@ class ADS1299SettingsController {
             textFieldIsActive = true;
         }
 
-        copyPaste.checkForCopyPaste(customCommandTF);
+        textfieldUpdateHelper.checkTextfield(customCommandTF);
     }
 
     public void draw() {
@@ -311,14 +311,14 @@ class ADS1299SettingsController {
     private ScrollableList createDropdown(int chanNum, String name, ADSSettingsEnum[] enumValues, ADSSettingsEnum e, color _backgroundColor) {
         int dropdownW = int((w - (spaceBetweenButtons*6)) / 5);
         int dropdownH = 18;
-        ScrollableList list = new CustomScrollableList(hwsCp5, name)
+        ScrollableList list = hwsCp5.addScrollableList(name)
             .setOpen(false)
             .setColorBackground(_backgroundColor) // text field bg color
             .setColorValueLabel(color(0))       // text color
             .setColorCaptionLabel(color(0))
             .setColorForeground(color(125))    // border color when not selected
             .setColorActive(BUTTON_PRESSED)       // border color when selected
-            .setBackgroundColor(OBJECT_BORDER_GREY)
+            .setOutlineColor(OBJECT_BORDER_GREY)
             .setSize(dropdownW, dropdownH)//temporary size
             .setBarHeight(dropdownH) //height of top/primary bar
             .setItemHeight(dropdownH) //height of all item/dropdown bars

OpenBCI_GUI/Board.pde

@@ -4,7 +4,7 @@ abstract class Board implements DataSource {
 
     private FixedStack<double[]> accumulatedData = new FixedStack<double[]>();
     private double[][] dataThisFrame;
-    private PacketLossTracker packetLossTracker;
+    protected PacketLossTracker packetLossTracker;
 
     // accessible by all boards, can be returned as valid empty data
     protected double[][] emptyData;

OpenBCI_GUI/BoardBrainFlowStreaming.pde

@@ -7,7 +7,6 @@ public enum BrainFlowStreaming_Boards
     CYTON("Cyton", BoardIds.CYTON_BOARD),
     CYTONDAISY("CytonDaisy", BoardIds.CYTON_DAISY_BOARD),
     GANGLION("Ganglion", BoardIds.GANGLION_BOARD),
-    GALEA("Galea", BoardIds.GALEA_BOARD),
     SYNTHETIC("Synthetic", BoardIds.SYNTHETIC_BOARD);
 
     private String name;

OpenBCI_GUI/BoardBrainflow.pde

@@ -16,6 +16,8 @@ abstract class BoardBrainFlow extends Board {
     protected int[] otherChannelsCache = null;
 
     protected boolean streaming = false;
+    protected double time_last_datapoint = -1.0;
+    protected boolean data_popup_displayed = false;
 
     /* Abstract Functions.
      * Implement these in your board.
@@ -73,7 +75,7 @@ abstract class BoardBrainFlow extends Board {
         }
 
         try {
-            boardShim.start_stream (450000);
+            boardShim.start_stream (450000, brainflowStreamer);
             streaming = true;
         }
         catch (BrainFlowError e) {
@@ -95,12 +97,17 @@ abstract class BoardBrainFlow extends Board {
         try {
             boardShim.stop_stream();
             streaming = false;
+            time_last_datapoint = -1.0;
         }
         catch (BrainFlowError e) {
             println("ERROR: Exception when stoppping stream");
             e.printStackTrace();
             streaming = true;
         }
+
+        if (eegDataSource != DATASOURCE_PLAYBACKFILE && eegDataSource != DATASOURCE_STREAMING) {
+            dataLogger.fileWriterBF.incrementBrainFlowStreamerFileNumber();
+        }
     }
 
     @Override
@@ -238,7 +245,25 @@ abstract class BoardBrainFlow extends Board {
     protected double[][] getNewDataInternal() {
         if(streaming) {
             try {
-                return boardShim.get_board_data();
+                double[][] data = boardShim.get_board_data();
+                if ((data[0].length == 0) && (time_last_datapoint > 0)) {
+                    double cur_time = System.currentTimeMillis() / 1000L;
+                    double timeout = 5.0;
+                    if (cur_time - time_last_datapoint > timeout) {
+                        if (data_popup_displayed == false) {
+                            PopupMessage msg = new PopupMessage("Data Streaming Error",
+                                "No new data received in " + timeout + " seconds. Please check your device and restart a GUI session.");
+                        }
+                        outputError("Data Streaming Error: No new data received in " + timeout + " seconds. Please check your device and restart a GUI session.");
+                        data_popup_displayed = true;
+                        stopRunning();
+                        topNav.resetStartStopButton();
+                    }
+                } else {
+                    time_last_datapoint = System.currentTimeMillis() / 1000L;
+                    data_popup_displayed = false;
+                }
+                return data;
             } catch (BrainFlowError e) {
                 println("WARNING: could not get board data.");
                 e.printStackTrace();

OpenBCI_GUI/BoardCyton.pde

@@ -104,7 +104,7 @@ abstract class BoardCytonSerialBase extends BoardCyton implements SmoothingCapab
 
     public BoardCytonSerialBase() {
         super();
-        smoothData = false;
+        setSmoothingActive(true);
     }
 
     // synchronized is important to ensure that we dont free buffers during getting data

OpenBCI_GUI/BoardGanglion.pde

@@ -187,6 +187,7 @@ abstract class BoardGanglion extends BoardBrainFlow implements AccelerometerCapa
             }
             sendCommand("z");
             startStreaming();
+            packetLossTracker = null;
         }
         else {
             if (!isCheckingImpedance) {
@@ -197,6 +198,7 @@ abstract class BoardGanglion extends BoardBrainFlow implements AccelerometerCapa
                 stopStreaming();
             }
             sendCommand("Z");
+            packetLossTracker = setupPacketLossTracker();
         }
         isCheckingImpedance = checkImpedance;
     }