Version 2.0 (code 15) with refactored connection and BCI modules

EEG101/android/app/build.gradle

@@ -90,7 +90,7 @@ android {
         applicationId "com.eeg_project"
         minSdkVersion 16
         targetSdkVersion 25
-        versionCode 14
+        versionCode 15
         versionName "2.0"
         ndk {
             abiFilters "armeabi-v7a"

EEG101/android/app/src/main/java/com/eeg_project/components/graphs/EEGGraph.java

@@ -139,8 +139,6 @@ public void initView(Context context) {
         // Create eegPlot
         eegPlot = new XYPlot(context, "Raw EEG Plot");
 
-        // get datasets (Y will be dataSeries, x will be implicitly generated):
-        //dataSource = new EEGDataSource(appState.connectedMuse.isLowEnergy());
 
         dataSeries = new DynamicSeries("dataSeries");
 

EEG101/src/components/DataCollector.js

@@ -99,7 +99,7 @@ export default class DataCollector extends Component {
               {I18n.t("totalCleanData")}
             </Text>
             <Button onPress={() => this.collectData()}>
-              {I18n.t("trainCollect")}
+              {I18n.t("trainCollectMore")}
             </Button>
           </View>
         );
@@ -127,7 +127,7 @@ export default class DataCollector extends Component {
               {I18n.t("totalCleanData2")}
             </Text>
             <Button onPress={() => this.collectData()}>
-              {I18n.t("trainCollect")}
+              {I18n.t("trainCollectMore")}
             </Button>
           </View>
         );

EEG101/src/components/MiniChart.js

@@ -41,19 +41,20 @@ export default class MiniChart extends Component {
             style={{
               position: "absolute",
               left: -20,
+              bottom: 75,
               fontWeight: "100",
               color: colors.black,
               fontFamily: "Roboto-Light",
               fontSize: 11,
               transform: [{ rotate: "270deg" }]
             }}
           >
-            {" "}Feature Rank
+            {" "}Feature Power
           </Text>
           <VictoryChart
             width={this.props.width}
             height={this.props.height - 50}
-            padding={{ bottom: 30, top: 10, right: 10, left: 30 }}
+            padding={{ bottom: 30, top: 10, right: 10, left: 55 }}
             domainPadding={{y:[0,10]}}
             style={{ labels: { fontSize: 10 } }}
           >
@@ -67,6 +68,7 @@ export default class MiniChart extends Component {
             />
             <VictoryAxis
               dependentAxis={true}
+              tickCount={4}
               style={{  tickLabels: { fontSize: 9 } }}
             />
             <VictoryLine
@@ -87,11 +89,18 @@ export default class MiniChart extends Component {
             />
           </VictoryChart>
         </View>
+        <View style={{alignItems: 'center', flexDirection: 'row'}}>
         <Image
           source={require("../assets/electrodelegend.png")}
           style={{ width: 150, height: 30 }}
           resizeMode="contain"
         />
+        <Image
+          source={require("../assets/electrodediagram.png")}
+          style={{ width: 50, height: 50 }}
+          resizeMode="contain"
+        />
+      </View>
       </View>
     );
   }

EEG101/src/components/PlayPauseButton.js

@@ -19,7 +19,7 @@ export default class PlayPauseButton extends Component{
     return(
       <TouchableOpacity onPress={this.props.onPress} disabled={this.props.disabled}>
         <Image source={imageSource} resizeMode='contain'
-               style={{height: 100, width: 100, alignSelf: 'center'}}/>
+               style={{height: 80, width: 80, alignSelf: 'center'}}/>
       </TouchableOpacity>
     )
   }

EEG101/src/i18n/locales/en.js

@@ -240,6 +240,7 @@ export default {
 	trainSamples:  'samples',
 	trainStop:  'STOP',
 	trainCollect:  'COLLECT',
+	trainCollectMore: 'COLLECT MORE (OPTIONAL)',
 	trainOn:  'ON',
 	trainOff:  'OFF',
 	trainFitClassifier:  'FIT CLASSIFIER',

EEG101/src/redux/reducer.js

@@ -44,14 +44,12 @@ export default function reducer(state = initialState, action = {}) {
       };
 
     case SET_AVAILABLE_MUSES:
-      console.log(JSON.stringify(action.payload));
       return {
         ...state,
         availableMuses: action.payload,
       };
 
     case SET_MUSE_INFO:
-      console.log(JSON.stringify(action.payload));
       return {
         ...state,
         museInfo: action.payload
@@ -60,7 +58,8 @@ export default function reducer(state = initialState, action = {}) {
     case SET_OFFLINE_MODE:
       return {
         ...state,
-        isOfflineMode: action.payload
+        isOfflineMode: action.payload,
+        connectionStatus: config.connectionStatus.NO_MUSES
       };
 
     case SET_MENU:

EEG101/src/scenes/bci-01.js

@@ -3,6 +3,7 @@ import React, { Component } from "react";
 import { StyleSheet, Text, View, ViewPagerAndroid, Image } from "react-native";
 import { connect } from "react-redux";
 import { MediaQueryStyleSheet } from "react-native-responsive";
+import config from "../redux/config";
 import I18n from "../i18n/i18n";
 import LinkButton from "../components/LinkButton";
 import PopUp from "../components/PopUp";
@@ -13,6 +14,7 @@ import * as colors from "../styles/colors";
 
 function mapStateToProps(state) {
   return {
+    connectionStatus: state.connectionStatus,
     dimensions: state.graphViewDimensions,
     isOfflineMode: state.isOfflineMode
   };
@@ -83,6 +85,16 @@ class BCIOne extends Component {
           title={I18n.t('machineLearningTitle')}
         > {I18n.t('machineLearningDefinition')} </PopUp>
 
+        <PopUp
+          onClose={()=>this.props.history.push('/connectorOne')}
+          visible={
+            this.props.connectionStatus === config.connectionStatus.DISCONNECTED
+          }
+          title={I18n.t('museDisconnectedTitle')}
+        >
+			{I18n.t('museDisconnectedDescription')}
+        </PopUp>
+
       </View>
     );
   }

EEG101/src/scenes/bci-02.js

@@ -17,6 +17,7 @@ import * as colors from "../styles/colors";
 
 function mapStateToProps(state) {
   return {
+    connectionStatus: state.connectionStatus,
     dimensions: state.graphViewDimensions,
     bciAction: state.bciAction
   };
@@ -171,6 +172,16 @@ class BCITwo extends Component {
             </View>
           </View>
         </ViewPagerAndroid>
+
+        <PopUp
+          onClose={()=>this.props.history.push('/connectorOne')}
+          visible={
+            this.props.connectionStatus === config.connectionStatus.DISCONNECTED
+          }
+          title={I18n.t('museDisconnectedTitle')}
+        >
+			{I18n.t('museDisconnectedDescription')}
+        </PopUp>
       </View>
     );
   }

EEG101/src/scenes/bci-run.js

@@ -28,6 +28,7 @@ import * as colors from "../styles/colors";
 
 function mapStateToProps(state) {
   return {
+    connectionStatus: state.connectionStatus,
     dimensions: state.graphViewDimensions,
     bciAction: state.bciAction
   };
@@ -40,7 +41,7 @@ class ClassifierRun extends Component {
     // Initialize States
     this.state = {
       popUp1Visible: false,
-      data: [1,1,1],
+      data: new Array(30).fill(1),
       noise: [],
       isRunning: false,
     };
@@ -153,6 +154,15 @@ class ClassifierRun extends Component {
             </View>
           </View>
         </ViewPagerAndroid>
+        <PopUp
+          onClose={()=>this.props.history.push('/connectorOne')}
+          visible={
+            this.props.connectionStatus === config.connectionStatus.DISCONNECTED
+          }
+          title={I18n.t('museDisconnectedTitle')}
+        >
+			{I18n.t('museDisconnectedDescription')}
+        </PopUp>
       </View>
     );
   }

EEG101/src/scenes/bci-train.js

@@ -15,6 +15,7 @@ import { setBCIAction } from "../redux/actions";
 import config from "../redux/config.js";
 import { MediaQueryStyleSheet } from "react-native-responsive";
 import Classifier from "../interface/Classifier.js";
+import PopUp from "../components/PopUp";
 import DecisionButton from "../components/DecisionButton.js";
 import SandboxButton from "../components/SandboxButton.js";
 import Button from "../components/Button.js";
@@ -25,6 +26,7 @@ import * as colors from "../styles/colors";
 
 function mapStateToProps(state) {
   return {
+    connectionStatus: state.connectionStatus,
     bciAction: state.bciAction,
     dimensions: state.graphViewDimensions
   };
@@ -197,7 +199,7 @@ class BCITrain extends Component {
           <View style={styles.classifierDataContainer}>
             <View style={styles.classifierTextContainer}>
               <Text style={styles.body}>
-                {I18n.t("trainAccuracy")}:{" "}
+                {I18n.t("trainAccuracy")}:{"\n"}
                 {Math.round(this.state.score * 1000) / 1000}
               </Text>
               <SandboxButton
@@ -216,7 +218,7 @@ class BCITrain extends Component {
               >
                 {I18n.t("trainReFit")}
               </SandboxButton>
-              <SandboxButton onPress={()=>Classifier.exportClassifier()}>EXPORT CLASSIFIER</SandboxButton>
+              <SandboxButton active="true" onPress={()=>Classifier.exportClassifier()}>EXPORT</SandboxButton>
             </View>
             <View style={styles.classifierGraphContainer}>
               <MiniChart
@@ -305,6 +307,15 @@ class BCITrain extends Component {
             </Button>
           </View>
         </View>
+        <PopUp
+          onClose={()=>this.props.history.push('/connectorOne')}
+          visible={
+            this.props.connectionStatus === config.connectionStatus.DISCONNECTED
+          }
+          title={I18n.t('museDisconnectedTitle')}
+        >
+			{I18n.t('museDisconnectedDescription')}
+        </PopUp>
       </View>
     );
   }