fixed bug with title of heartSpectra, fixed it so if stream aux and go to other module it doesnt crash

kylemath · kylemath · commit 02f2aee94783 · 2020-01-07T09:16:30.000-07:00
diff --git a/src/components/PageSwitcher/PageSwitcher.js b/src/components/PageSwitcher/PageSwitcher.js
@@ -5,7 +5,7 @@ import { Select, Card, Stack, Button, ButtonGroup, Checkbox } from "@shopify/pol
 import { mockMuseEEG } from "./utils/mockMuseEEG";
 import * as translations from "./translations/en.json";
 import * as generalTranslations from "./components/translations/en";
-import { emptyChannelData, emptyAuxChannelData, emptySingleChannelData } from "./components/chartOptions";
+import { emptyAuxChannelData } from "./components/chartOptions";
 
 import * as funIntro from "./components/EEGEduIntro/EEGEduIntro"
 import * as funHeartRaw from "./components/EEGEduHeartRaw/EEGEduHeartRaw"
@@ -47,18 +47,18 @@ export function PageSwitcher() {
   let showAux = true; // if it is even available to press (to prevent in some modules)
 
   // data pulled out of multicast$
-  const [introData, setIntroData] = useState(emptyChannelData)
-  const [heartRawData, setHeartRawData] = useState(emptyChannelData);
-  const [heartSpectraData, setHeartSpectraData] = useState(emptySingleChannelData);
+  const [introData, setIntroData] = useState(emptyAuxChannelData)
+  const [heartRawData, setHeartRawData] = useState(emptyAuxChannelData);
+  const [heartSpectraData, setHeartSpectraData] = useState(emptyAuxChannelData);
   const [rawData, setRawData] = useState(emptyAuxChannelData);
   const [spectraData, setSpectraData] = useState(emptyAuxChannelData); 
   const [bandsData, setBandsData] = useState(emptyAuxChannelData);
-  const [animateData, setAnimateData] = useState(emptyChannelData);
-  const [spectroData, setSpectroData] = useState(emptyChannelData);
+  const [animateData, setAnimateData] = useState(emptyAuxChannelData);
+  const [spectroData, setSpectroData] = useState(emptyAuxChannelData);
   const [alphaData, setAlphaData] = useState(emptyAuxChannelData);
   const [ssvepData, setSsvepData] = useState(emptyAuxChannelData);
   const [evokedData, setEvokedData] = useState(emptyAuxChannelData);
-  const [predictData, setPredictData] = useState(emptyChannelData);
+  const [predictData, setPredictData] = useState(emptyAuxChannelData);
 
   // pipe settings
   const [introSettings] = useState(funIntro.getSettings);
diff --git a/src/components/PageSwitcher/components/EEGEduAnimate/EEGEduAnimate.js b/src/components/PageSwitcher/components/EEGEduAnimate/EEGEduAnimate.js
@@ -32,7 +32,6 @@ export function getSettings () {
   return {
     cutOffLow: 2,
     cutOffHigh: 20,
-    nbChannels: 4,
     interval: 16,
     bins: 256,
     duration: 128,
@@ -52,7 +51,7 @@ export function buildPipe(Settings) {
   window.pipeAnimate$ = zipSamples(window.source.eegReadings$).pipe(
     bandpassFilter({ 
       cutoffFrequencies: [Settings.cutOffLow, Settings.cutOffHigh], 
-      nbChannels: Settings.nbChannels }),
+      nbChannels: window.nchans }),
     epoch({
       duration: Settings.duration,
       interval: Settings.interval,
@@ -76,7 +75,6 @@ export function setup(setData, Settings) {
     window.subscriptionAnimate = window.multicastAnimate$.subscribe(data => {
       setData(animateData => {
         Object.values(animateData).forEach((channel, index) => {
-          if (index < 4) {
             channel.datasets[0].data = [
               data.delta[index],
               data.theta[index],
@@ -85,14 +83,14 @@ export function setup(setData, Settings) {
               data.gamma[index]
             ];
             channel.xLabels = bandLabels;
-          }
         });
 
         return {
           ch0: animateData.ch0,
           ch1: animateData.ch1,
           ch2: animateData.ch2,
-          ch3: animateData.ch3
+          ch3: animateData.ch3,
+          ch4: animateData.ch4
         };
       });
     });
@@ -129,14 +127,15 @@ export function renderModule(channels) {
     }, []);
 
     return Object.values(channels.data).map((channel, index) => {
-      // console.log(channel) 
       if (channel.datasets[0].data) {
-        // console.log( channel.datasets[0].data[2])
-        window.delta = channel.datasets[0].data[0];
-        window.theta = channel.datasets[0].data[1];
-        window.alpha = channel.datasets[0].data[2];
-        window.beta  = channel.datasets[0].data[3];
-        window.gamma = channel.datasets[0].data[4];
+        if (index === 1) {
+          // console.log( channel.datasets[0].data[2])
+          window.delta = channel.datasets[0].data[0];
+          window.theta = channel.datasets[0].data[1];
+          window.alpha = channel.datasets[0].data[2];
+          window.beta  = channel.datasets[0].data[3];
+          window.gamma = channel.datasets[0].data[4];
+        }
       }   
 
       let thisSketch = sketchTone;
diff --git a/src/components/PageSwitcher/components/EEGEduHeartRaw/EEGEduHeartRaw.js b/src/components/PageSwitcher/components/EEGEduHeartRaw/EEGEduHeartRaw.js
@@ -24,7 +24,6 @@ export function getSettings () {
   return {
     cutOffLow: 2,
     cutOffHigh: 20,
-    nbChannels: 4,
     interval: 50,
     srate: 256,
     duration: 1024,
@@ -43,7 +42,7 @@ export function buildPipe(Settings) {
   window.pipeHeartRaw$ = zipSamples(window.source.eegReadings$).pipe(
     bandpassFilter({ 
       cutoffFrequencies: [Settings.cutOffLow, Settings.cutOffHigh], 
-      nbChannels: Settings.nbChannels }),
+      nbChannels: window.nchans }),
     epoch({
       duration: Settings.duration,
       interval: Settings.interval,
@@ -65,18 +64,17 @@ export function setup(setData, Settings) {
     window.subscriptionHeartRaw = window.multicastHeartRaw$.subscribe(data => {
       setData(heartRawData => {
         Object.values(heartRawData).forEach((channel, index) => {
-          if (index < 4) {
             channel.datasets[0].data = data.data[index];
             channel.xLabels = generateXTics(Settings.srate, Settings.duration);
             channel.datasets[0].qual = standardDeviation(data.data[index])          
-          }
         });
 
         return {
           ch0: heartRawData.ch0,
           ch1: heartRawData.ch1,
           ch2: heartRawData.ch2,
-          ch3: heartRawData.ch3
+          ch3: heartRawData.ch3,
+          ch4: heartRawData.ch4
         };
       });
     });
@@ -89,49 +87,49 @@ export function setup(setData, Settings) {
 export function renderModule(channels) {
   function renderCharts() {
     return Object.values(channels.data).map((channel, index) => {
-      const options = {
-        ...generalOptions,
-        scales: {
-          xAxes: [
-            {
-              scaleLabel: {
-                ...generalOptions.scales.xAxes[0].scaleLabel,
-                labelString: specificTranslations.xlabel
+      if (index === 1) {
+        const options = {
+          ...generalOptions,
+          scales: {
+            xAxes: [
+              {
+                scaleLabel: {
+                  ...generalOptions.scales.xAxes[0].scaleLabel,
+                  labelString: specificTranslations.xlabel
+                }
               }
-            }
-          ],
-          yAxes: [
-            {
-              scaleLabel: {
-                ...generalOptions.scales.yAxes[0].scaleLabel,
-                labelString: specificTranslations.ylabel
-              },
-              ticks: {
-                max: 300,
-                min: -300
+            ],
+            yAxes: [
+              {
+                scaleLabel: {
+                  ...generalOptions.scales.yAxes[0].scaleLabel,
+                  labelString: specificTranslations.ylabel
+                },
+                ticks: {
+                  max: 300,
+                  min: -300
+                }
               }
+            ]
+          },
+          elements: {
+            line: {
+              borderColor: 'rgba(' + channel.datasets[0].qual + ', 128, 128)',
+              fill: false
+            },
+            point: {
+              radius: 0
             }
-          ]
-        },
-        elements: {
-          line: {
-            borderColor: 'rgba(' + channel.datasets[0].qual + ', 128, 128)',
-            fill: false
           },
-          point: {
-            radius: 0
+          animation: {
+            duration: 0
+          },
+          title: {
+            ...generalOptions.title,
+            text: generalTranslations.channel + channelNames[index] + ' --- SD: ' + channel.datasets[0].qual 
           }
-        },
-        animation: {
-          duration: 0
-        },
-        title: {
-          ...generalOptions.title,
-          text: generalTranslations.channel + channelNames[index] + ' --- SD: ' + channel.datasets[0].qual 
-        }
-      };
+        };
 
-      if (index === 1) {
         return (
           <Card.Section key={"Card_" + index}>
             <Line key={"Line_" + index} data={channel} options={options} />
diff --git a/src/components/PageSwitcher/components/EEGEduHeartSpectra/EEGEduHeartSpectra.js b/src/components/PageSwitcher/components/EEGEduHeartSpectra/EEGEduHeartSpectra.js
@@ -27,7 +27,6 @@ export function getSettings() {
   return {
     cutOffLow: .01,
     cutOffHigh: 20,
-    nbChannels: 4,
     interval: 100,
     bins: 8192,
     sliceFFTLow: 0.6,
@@ -50,7 +49,7 @@ export function buildPipe(Settings) {
   window.pipeHeartSpectra$ = zipSamples(window.source.eegReadings$).pipe(
     bandpassFilter({ 
       cutoffFrequencies: [Settings.cutOffLow, Settings.cutOffHigh], 
-      nbChannels: Settings.nbChannels }),
+      nbChannels: window.nchans }),
     epoch({
       duration: Settings.duration,
       interval: Settings.interval,
@@ -125,7 +124,7 @@ export function renderModule(channels) {
           title: {
             ...generalOptions.title,
             text: generalTranslations.channel + 
-              channelNames[index] + 
+              channelNames[1] + 
               " - Estimated HR: " +
               channel.peakF + " BPM"
           }
diff --git a/src/components/PageSwitcher/components/EEGEduIntro/EEGEduIntro.js b/src/components/PageSwitcher/components/EEGEduIntro/EEGEduIntro.js
@@ -24,7 +24,6 @@ export function getSettings () {
     name: "Intro",
     cutOffLow: 2,
     cutOffHigh: 20,
-    nbChannels: 4,
     interval: 2,
     srate: 256,
     duration: 512
@@ -42,7 +41,7 @@ export function buildPipe(Settings) {
  window.pipeIntro$ = zipSamples(window.source.eegReadings$).pipe(
     bandpassFilter({ 
       cutoffFrequencies: [Settings.cutOffLow, Settings.cutOffHigh], 
-      nbChannels: Settings.nbChannels }),
+      nbChannels: window.nchans }),
     epoch({
       duration: Settings.duration,
       interval: Settings.interval,
@@ -72,10 +71,7 @@ export function setup(setData, Settings) {
         });
 
         return {
-          ch0: introData.ch0,
-          ch1: introData.ch1,
-          ch2: introData.ch2,
-          ch3: introData.ch3
+          ch0: introData.ch0
         };
       });
     });
diff --git a/src/components/PageSwitcher/components/EEGEduPredict/EEGEduPredict.js b/src/components/PageSwitcher/components/EEGEduPredict/EEGEduPredict.js
@@ -30,7 +30,6 @@ export function getSettings() {
   return {
     cutOffLow: 2,
     cutOffHigh: 20,
-    nbChannels: 4,
     interval: 256,
     bins: 256,
     sliceFFTLow: 1,
@@ -52,7 +51,7 @@ export function buildPipe(Settings) {
   window.pipePredict$ = zipSamples(window.source.eegReadings$).pipe(
     bandpassFilter({ 
       cutoffFrequencies: [Settings.cutOffLow, Settings.cutOffHigh], 
-      nbChannels: Settings.nbChannels }),
+      nbChannels: window.nchans }),
     epoch({
       duration: Settings.duration,
       interval: Settings.interval,
@@ -77,17 +76,16 @@ export function setup(setData, Settings) {
     window.subscriptionPredict = window.multicastPredict$.subscribe(data => {
       setData(predictData => {
         Object.values(predictData).forEach((channel, index) => {
-          if (index < 4) {
-            channel.datasets[0].data = data.psd[index];
-            channel.xLabels = data.freqs;
-          }
+          channel.datasets[0].data = data.psd[index];
+          channel.xLabels = data.freqs;      
         });
 
         return {
           ch0: predictData.ch0,
           ch1: predictData.ch1,
           ch2: predictData.ch2,
-          ch3: predictData.ch3
+          ch3: predictData.ch3,
+          ch4: predictData.ch4
         };
       });
     });
diff --git a/src/components/PageSwitcher/components/EEGEduSpectro/EEGEduSpectro.js b/src/components/PageSwitcher/components/EEGEduSpectro/EEGEduSpectro.js
@@ -26,7 +26,6 @@ export function getSettings () {
   return {
     cutOffLow: 1,
     cutOffHigh: 100,
-    nbChannels: 4,
     interval: 16,
     bins: 128,
     duration: 128,
@@ -48,7 +47,7 @@ export function buildPipe(Settings) {
   window.pipeSpectro$ = zipSamples(window.source.eegReadings$).pipe(
     bandpassFilter({ 
       cutoffFrequencies: [Settings.cutOffLow, Settings.cutOffHigh], 
-      nbChannels: Settings.nbChannels }),
+      nbChannels: window.nchans }),
     epoch({
       duration: Settings.duration,
       interval: Settings.interval,
@@ -72,17 +71,16 @@ export function setup(setData, Settings) {
     window.subscriptionSpectro = window.multicastSpectro$.subscribe(data => {
       setData(spectroData => {
         Object.values(spectroData).forEach((channel, index) => {
-          if (index < 4) {
-            channel.datasets[0].data = data.psd[index];
-            channel.xLabels = data.freqs
-          }
+          channel.datasets[0].data = data.psd[index];
+          channel.xLabels = data.freqs
         });
 
         return {
           ch0: spectroData.ch0,
           ch1: spectroData.ch1,
           ch2: spectroData.ch2,
-          ch3: spectroData.ch3
+          ch3: spectroData.ch3,
+          ch4: spectroData.ch4
         };
       });
     });
