Gui improvements

BrainWaveOSC/src/ofApp.cpp

@@ -68,19 +68,34 @@ void ofApp::setup(){
 	allData.eegTheta = 0;
 	allData.elapsed = 0;
     allData.blinkStrength = 0;
-
-    normaliseMaxToCurrentSet = false;    
-
-    // default device settings
-    deviceName = "/dev/tty.BrainBand-DevB"; // osx address, windows is com6 or something
+    normaliseMaxToCurrentSet = false;
+
+    setupGui();
+    refreshDevices();
+    updateDeviceInfo();
+    // default device settings  // TODO automatize setup
+    if (devicesList.empty()) {
+        #if defined(TARGET_OSX)
+        deviceName = "/dev/tty.BrainBand-DevB";
+        #elif defined(TARGET_LINUX)
+        deviceName = "/dev/rfcomm0";
+        #elif defined(TARGET_WIN32)
+        deviceName = "COM6";
+        #endif
+    } else {
+        deviceName = devicesList[0];
+    }
     deviceBaudRate = 57600;
+
+    ofLog() << "Initial values: \n"
+            << "Device name: " << deviceName << "\n"
+            << "Baudrate: " << deviceBaudRate << "\n";
 
     // osc settings
     host = "127.0.0.1"; // change via xml
     port = 7771; // change via xml
     receivePort=7772; // change via xml
 
-    setupGui();      
 
     // setup thinkgear hardware using serial streamer or comms driver (osx only tested).
     // TG_STREAM_PARSER is default
@@ -91,11 +106,23 @@ void ofApp::setup(){
     // change in settings.xml to launch minimised window with no logging
     if(smallWindow) {
         ofSetLogLevel(OF_LOG_SILENT);
-        ofSetWindowShape(250, 75);
+        setSmallWindow();
         settings.hide();
+    } else {
+        setNormalWindow();
     }
 }
 
+void ofApp::setSmallWindow() {
+    ofSetWindowShape(250, 75);
+    smallWindow = true;
+}
+
+void ofApp::setNormalWindow() {
+    ofSetWindowShape(1280, 850);
+    smallWindow = false;
+}
+
 void ofApp::setupGui() {
 
     // setup gui

BrainWaveOSC/src/ofApp.h

@@ -60,6 +60,8 @@ class ofApp : public ofBaseApp {
     void setupGui();
     BrainWaveGUI settings;
     void onGUIChanged(ofxTouchGUIEventArgs& args);
+    void setSmallWindow();
+    void setNormalWindow();
     bool smallWindow;
 
 
@@ -79,13 +81,17 @@ class ofApp : public ofBaseApp {
     EegFrequencyGraph* frequencyGraph;
     ofxTouchGUISlider* timeline;
     vector<EegTimeGraph*> eegSet;
-
+    ofxTouchGUIDropDown* deviceChooser;
+    ofxTouchGUIDropDown* baudrateChooser;
+    ofxTouchGUIButton* refreshButton;
+    ofxTouchGUIButton* disconnectButton;
+    ofxTouchGUIButton* connectButton;
+
     bool normaliseMaxToCurrentSet;
 
     float startTime;
     float timeElapsed;
 
-
     // file saving
     ofFile output;
     bool isRecording;    
@@ -103,9 +109,20 @@ class ofApp : public ofBaseApp {
     int receivePort;
 
     // mindplay brainband bluetooth device
+    void updateDeviceInfo();
+    void refreshDevices();
+    void setupDevice(int id);
+    void setupBaudrate(int id);
+    void connectDevice();
+    void disconnectDevice();
+    bool deviceIsConnected = false;
     ofxThinkgear tg;
     ofxThinkgearEventArgs data;
     string deviceName;
+    string deviceInfoString;
+
+    vector<string> devicesList;
+    vector<string> baudrateList;
     int deviceBaudRate;
 
     // custom eeg data struct to capture all the data from thinkgear events
@@ -119,5 +136,4 @@ class ofApp : public ofBaseApp {
     int playhead;
     vector<EegData> dataEntries;
 
-
 };