Logic analyser UI improved, recording added (fossasia#538)

boy-who-codes · Aug 31, 2019 · d7796bb · d7796bb
1 parent 5599b4d
commit d7796bb
Show file tree

Hide file tree

Showing 21 changed files with 124 additions and 37 deletions.
diff --git a/background_tasks/playback.html b/background_tasks/playback.html
@@ -30,6 +30,9 @@
 						case 'FETCH_ROB_ARM':
 							ipcRenderer.send('FETCH_ROB_ARM');
 							break;
+						case 'FETCH_LA':
+							ipcRenderer.send('FETCH_LA');
+							break;
 						case 'DATA_WRITING_STATUS':
 							ipcRenderer.send('DATA_WRITING_STATUS', parsedJSON);
 							break;

diff --git a/public/electron.js b/public/electron.js
@@ -121,3 +121,7 @@ ipcMain.on('DATA_WRITING_STATUS', (event, args) => {
 ipcMain.on('FETCH_ROB_ARM', (event, args) => {
   mainWindow.webContents.send('FETCH_ROB_ARM', args);
 });
+
+ipcMain.on('FETCH_LA', (event, args) => {
+  mainWindow.webContents.send('FETCH_LA', args);
+});
diff --git a/scripts/playback_bridge.py b/scripts/playback_bridge.py
@@ -2,8 +2,10 @@
 import time
 import json
 from playback_robot import PlaybackRobot
+from playback_la import LA
 
 playbackRobot = PlaybackRobot()
+la = LA()
 
 
 def main():
@@ -18,6 +20,11 @@ def main():
             print(json.dumps(output))
             sys.stdout.flush()
 
+        if command == 'SAVE_DATA_LA':
+            output = {'type': 'FETCH_LA'}
+            print(json.dumps(output))
+            sys.stdout.flush()
+
         if command == 'WRITE_ROB_ARM':
             servo1 = parsed_stream_data['servo1']
             servo2 = parsed_stream_data['servo2']
@@ -26,6 +33,20 @@ def main():
             data_path = parsed_stream_data['dataPath']
             playbackRobot.write(data_path, servo1, servo2, servo3, servo4)
 
+        if command == 'WRITE_LA':
+            la_1_voltage = parsed_stream_data['LA1Voltage']
+            la_2_voltage = parsed_stream_data['LA2Voltage']
+            la_3_voltage = parsed_stream_data['LA3Voltage']
+            la_4_voltage = parsed_stream_data['LA4Voltage']
+            la_1_time = parsed_stream_data['LA1Time']
+            la_2_time = parsed_stream_data['LA2Time']
+            la_3_time = parsed_stream_data['LA3Time']
+            la_4_time = parsed_stream_data['LA4Time']
+            number_of_channels = parsed_stream_data['numberOfChannels']
+            data_path = parsed_stream_data['dataPath']
+            la.write(data_path, number_of_channels, la_1_voltage, la_1_time,
+                     la_2_voltage, la_2_time, la_3_voltage, la_3_time, la_4_voltage, la_4_time,)
+
         if command == 'KILL':
             exit()
 

diff --git a/scripts/playback_la.py b/scripts/playback_la.py
@@ -0,0 +1,29 @@
+import time
+import datetime
+import sys
+import json
+
+
+class LA:
+    def write(self, data_path, number_of_channels, la_1_voltage, la_1_time,
+              la_2_voltage, la_2_time, la_3_voltage, la_3_time, la_4_voltage, la_4_time):
+        file_name = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S:000")
+        file_pointed = open(data_path + '/' + file_name + '.csv', "w+")
+        file_pointed.write("%s, %s \n\n" % (
+            'LogicAnalyzer', str(datetime.datetime.now())))
+        file_pointed.write(
+            "Number of Channels, Voltage 1, Time 1, Voltage 2, Time 2, Voltage 3, Time 3, Voltage 4, Time 4\n")
+        file_pointed.write(
+            "%s, %s, %s, %s, %s, %s, %s, %s, %s\n" % (
+                str(number_of_channels),
+                ' '.join(map(str, la_1_voltage)), ' '.join(
+                    map(str, la_1_time)),
+                ' '.join(map(str, la_2_voltage)), ' '.join(
+                    map(str, la_2_time)),
+                ' '.join(map(str, la_3_voltage)), ' '.join(
+                    map(str, la_3_time)),
+                ' '.join(map(str, la_4_voltage)), ' '.join(map(str, la_4_time)),))
+        file_pointed.close()
+        print(json.dumps({'type': 'DATA_WRITING_STATUS',
+                          'message': 'Data saved', }))
+        sys.stdout.flush()
diff --git a/src/App.js b/src/App.js
@@ -8,7 +8,7 @@ import { ThemeProvider } from 'styled-components';
 import Appshell from './components/Appshell';
 import Home from './screen/Home';
 import Oscilloscope from './screen/Oscilloscope';
-import LogicAnalyser from './screen/LogicAnalyser';
+import LogicAnalyzer from './screen/LogicAnalyzer';
 import PowerSource from './screen/PowerSource';
 import WaveGenerator from './screen/WaveGenerator';
 import Multimeter from './screen/Multimeter';
@@ -207,7 +207,12 @@ class App extends Component {
                     />
                   )}
                 />
-                <Route path="/logicanalyser" component={LogicAnalyser} />
+                <Route
+                  path="/logicanalyzer"
+                  render={props => (
+                    <LogicAnalyzer {...props} dataPath={dataPath} />
+                  )}
+                />
                 <Route
                   path="/powersource/:filePath?"
                   render={props => (

diff --git a/src/components/Appshell/Appshell.js b/src/components/Appshell/Appshell.js
@@ -203,6 +203,24 @@ const Appshell = ({
             <SaveIcon />
           </IconButton>
         );
+      case '/logicanalyzer':
+        return (
+          <IconButton
+            className={classes.iconButton}
+            size="medium"
+            disabled={!device.isConnected}
+            onClick={() => {
+              loadBalancer.start(ipcRenderer, 'playback');
+              setTimeout(() => {
+                loadBalancer.sendData(ipcRenderer, 'playback', {
+                  command: 'SAVE_DATA_LA',
+                });
+              }, 500);
+            }}
+          >
+            <SaveIcon />
+          </IconButton>
+        );
       case '/multimeter':
         return isWriting ? (
           <IconButton

diff --git a/src/components/Icons/PSLabIcons.js b/src/components/Icons/PSLabIcons.js
@@ -1,12 +1,12 @@
 import React from 'react';
 import OscilloscopeSvg from '../../resources/oscilloscope.svg';
-import LogicAnalyserSvg from '../../resources/logic_analyzer.svg';
+import LogicAnalyzerSvg from '../../resources/logic_analyzer.svg';
 import PowerSourceSvg from '../../resources/power_source.svg';
 import WaveGeneratorSvg from '../../resources/wave_generator.svg';
 import MultimeterSvg from '../../resources/multimeter.svg';
 import SensorsSvg from '../../resources/sensors.svg';
 import OscilloscopeRedSvg from '../../resources/oscilloscope_red.svg';
-import LogicAnalyserRedSvg from '../../resources/logic_analyzer_red.svg';
+import LogicAnalyzerRedSvg from '../../resources/logic_analyzer_red.svg';
 import PowerSourceRedSvg from '../../resources/power_source_red.svg';
 import WaveGeneratorRedSvg from '../../resources/wave_generator_red.svg';
 import MultimeterRedSvg from '../../resources/multimeter_red.svg';
@@ -24,14 +24,14 @@ export const OscilloscopeIcon = ({ size, color }) => {
   );
 };
 
-export const LogicAnalyserIcon = ({ size, color }) => {
+export const LogicAnalyzerIcon = ({ size, color }) => {
   return (
     <img
       style={{
         height: size,
         width: 'auto',
       }}
-      src={color === 'red' ? LogicAnalyserRedSvg : LogicAnalyserSvg}
+      src={color === 'red' ? LogicAnalyzerRedSvg : LogicAnalyzerSvg}
     />
   );
 };

diff --git a/src/screen/Home/components/Tabs.js b/src/screen/Home/components/Tabs.js
@@ -1,11 +1,10 @@
 import React from 'react';
-import { Settings as SettingIcon, TabRounded } from '@material-ui/icons';
 import { Scrollbars } from 'react-custom-scrollbars';
 import InstrumentCard from './InstrumentCard';
 import { TabsContainer, TabsWrapper, TabsRow } from './Tabs.styles';
 import {
   OscilloscopeIcon,
-  LogicAnalyserIcon,
+  LogicAnalyzerIcon,
   WaveGeneratorIcon,
   PowerSourceIcon,
   MultimeterIcon,
@@ -25,10 +24,10 @@ const Tabs = () => {
               redirectPath={'/oscilloscope'}
             />
             <InstrumentCard
-              icon={<LogicAnalyserIcon size={'10em'} />}
-              title={'Logic Analyser'}
+              icon={<LogicAnalyzerIcon size={'10em'} />}
+              title={'Logic Analyzer'}
               description={'Captures and displays signals from digital systems'}
-              redirectPath={'/logicanalyser'}
+              redirectPath={'/logicanalyzer'}
             />
           </TabsWrapper>
         </TabsRow>

diff --git a/src/screen/LoggedData/LoggedData.js b/src/screen/LoggedData/LoggedData.js
@@ -10,7 +10,7 @@ import {
 } from '@material-ui/icons';
 import {
   OscilloscopeIcon,
-  LogicAnalyserIcon,
+  LogicAnalyzerIcon,
   WaveGeneratorIcon,
   PowerSourceIcon,
   MultimeterIcon,
@@ -133,8 +133,8 @@ class LoggedData extends Component {
     switch (device) {
       case 'Oscilloscope':
         return <OscilloscopeIcon color="red" size={'2em'} />;
-      case 'LogicAnalyser':
-        return <LogicAnalyserIcon color="red" size={'2em'} />;
+      case 'LogicAnalyzer':
+        return <LogicAnalyzerIcon color="red" size={'2em'} />;
       case 'WaveGenerator':
         return <WaveGeneratorIcon color="red" size={'2em'} />;
       case 'PowerSource':

diff --git a/src/screen/LogicAnalyser/index.js b/src/screen/LogicAnalyser/index.js
diff --git a/src/screen/LogicAnalyser/LogicAnalyser.js → src/screen/LogicAnalyzer/LogicAnalyzer.js b/src/screen/LogicAnalyser/LogicAnalyser.js → src/screen/LogicAnalyzer/LogicAnalyzer.js
@@ -10,7 +10,7 @@ const electron = window.require('electron');
 const { ipcRenderer } = electron;
 const loadBalancer = window.require('electron-load-balancer');
 
-class LogicAnalyser extends Component {
+class LogicAnalyzer extends Component {
   constructor(props) {
     super(props);
     this.state = {
@@ -212,6 +212,7 @@ class LogicAnalyser extends Component {
             isReading={isReading}
             numberOfChannels={numberOfChannels}
             toggleRead={this.toggleRead}
+            dataPath={this.props.dataPath}
           />
         }
       />
@@ -226,4 +227,4 @@ const mapStateToProps = state => ({
 export default connect(
   mapStateToProps,
   null,
-)(LogicAnalyser);
+)(LogicAnalyzer);
diff --git a/...LogicAnalyser/components/ActionButtons.js → ...LogicAnalyzer/components/ActionButtons.js b/...LogicAnalyser/components/ActionButtons.js → ...LogicAnalyzer/components/ActionButtons.js
@@ -1,7 +1,4 @@
 import React from 'react';
-import ReadIcon from '@material-ui/icons/PlayCircleFilled';
-import StopIcon from '@material-ui/icons/PauseCircleFilled';
-import RecordIcon from '@material-ui/icons/RadioButtonChecked';
 import { Button } from '@material-ui/core';
 import { withStyles } from '@material-ui/core/styles';
 import { ButtonWrapper } from './ActionButtons.styles';
@@ -19,24 +16,11 @@ const ActionButtons = ({ isConnected, isReading, toggleRead, classes }) => {
         fullWidth={true}
         variant="contained"
         size="large"
-        color="default"
         disabled={!isConnected}
         onClick={toggleRead}
+        style={{ color: '#d32f2f' }}
       >
-        {isReading ? (
-          <StopIcon style={{ fontSize: 20 }} />
-        ) : (
-          <ReadIcon style={{ fontSize: 20 }} />
-        )}
-      </Button>
-      <Button
-        className={classes.buttonMargin}
-        fullWidth={true}
-        variant="contained"
-        size="large"
-        color="default"
-      >
-        <RecordIcon style={{ fontSize: 20 }} />
+        {isReading ? <b>ANALYZING</b> : <b>ANALYZE</b>}
       </Button>
     </ButtonWrapper>
   );

diff --git a/...alyser/components/ActionButtons.styles.js → ...alyzer/components/ActionButtons.styles.js b/...alyser/components/ActionButtons.styles.js → ...alyzer/components/ActionButtons.styles.js
diff --git a/...Analyser/components/AnalysisParameters.js → ...Analyzer/components/AnalysisParameters.js b/...Analyser/components/AnalysisParameters.js → ...Analyzer/components/AnalysisParameters.js
diff --git a/...cAnalyser/components/ChannelParameters.js → ...cAnalyzer/components/ChannelParameters.js b/...cAnalyser/components/ChannelParameters.js → ...cAnalyzer/components/ChannelParameters.js
diff --git a/src/screen/LogicAnalyser/components/Graph.js → src/screen/LogicAnalyzer/components/Graph.js b/src/screen/LogicAnalyser/components/Graph.js → src/screen/LogicAnalyzer/components/Graph.js
@@ -16,6 +16,7 @@ import { GraphWrapper, ProgressWrapper } from './Settings.styles';
 
 const electron = window.require('electron');
 const { ipcRenderer } = electron;
+const loadBalancer = window.require('electron-load-balancer');
 
 class Graph extends Component {
   constructor(props) {
@@ -58,10 +59,32 @@ class Graph extends Component {
         toggleRead();
       }
     });
+
+    ipcRenderer.on('FETCH_LA', (event, args) => {
+      const { LA1Data, LA2Data, LA3Data, LA4Data } = this.state;
+      const { dataPath, numberOfChannels } = this.props;
+      loadBalancer.sendData(ipcRenderer, 'playback', {
+        command: 'WRITE_LA',
+        LA1Voltage: LA1Data ? LA1Data.map(item => item.voltage) : [],
+        LA1Time: LA1Data ? LA1Data.map(item => item.time) : [],
+        LA2Voltage: LA2Data ? LA2Data.map(item => item.voltage) : [],
+        LA2Time: LA2Data ? LA2Data.map(item => item.time) : [],
+        LA3Voltage: LA3Data ? LA3Data.map(item => item.voltage) : [],
+        LA3Time: LA3Data ? LA3Data.map(item => item.time) : [],
+        LA4Voltage: LA4Data ? LA4Data.map(item => item.voltage) : [],
+        LA4Time: LA4Data ? LA4Data.map(item => item.time) : [],
+        numberOfChannels,
+        dataPath,
+      });
+      setTimeout(() => {
+        loadBalancer.stop(ipcRenderer, 'playback');
+      }, 500);
+    });
   }
 
   componentWillUnmount() {
     ipcRenderer.removeAllListeners('LA_DATA');
+    ipcRenderer.removeAllListeners('FETCH_LA');
   }
 
   render() {

diff --git a/...gicAnalyser/components/NumberParameter.js → ...gicAnalyzer/components/NumberParameter.js b/...gicAnalyser/components/NumberParameter.js → ...gicAnalyzer/components/NumberParameter.js
diff --git a/...reen/LogicAnalyser/components/Settings.js → ...reen/LogicAnalyzer/components/Settings.js b/...reen/LogicAnalyser/components/Settings.js → ...reen/LogicAnalyzer/components/Settings.js
diff --git a/...gicAnalyser/components/Settings.styles.js → ...gicAnalyzer/components/Settings.styles.js b/...gicAnalyser/components/Settings.styles.js → ...gicAnalyzer/components/Settings.styles.js
diff --git a/...ogicAnalyser/components/settingOptions.js → ...ogicAnalyzer/components/settingOptions.js b/...ogicAnalyser/components/settingOptions.js → ...ogicAnalyzer/components/settingOptions.js
diff --git a/src/screen/LogicAnalyzer/index.js b/src/screen/LogicAnalyzer/index.js
@@ -0,0 +1,3 @@
+import LogicAnalyzer from './LogicAnalyzer';
+
+export default LogicAnalyzer;