Simulate button in the topbar

Author: filippomc

webapp/components/definition/cellRules/SelectCellTemplate.js

@@ -76,7 +76,7 @@ export default class NetPyNENewPlot extends React.Component {
             value={"Simple_HH"}
             onClick={() => this.handleSelection("Simple_HH")} 
           >
-            Simple HH cell
+            Basic HH cell
           </MenuItem>
 
           <MenuItem 

webapp/components/index.js

@@ -265,7 +265,8 @@ export const SwitchPageButton = connect(
     switchToEditModelPage: () => dispatch(editModel),
     createNetwork: () => dispatch(createNetwork),
     createAndSimulateNetwork: () => dispatch(createAndSimulateNetwork),
-    showNetwork: () => dispatch(showNetwork)
+    showNetwork: () => dispatch(showNetwork),
+    simulateNetwork: () => dispatch(simulateNetwork)
   })
 )(_SwitchPageButton)
 

webapp/components/topbar/SwitchPageButton.js

@@ -1,10 +1,11 @@
 import React, { Component } from 'react'
 
-import { withStyles } from '@material-ui/core/styles'
-import Button from '@material-ui/core/Button'
-import Icon from '../general/NetPyNEIcons'
-import { TOPBAR_CONSTANTS, MODEL_STATE } from '../../constants'
-
+import { withStyles } from '@material-ui/core/styles';
+import Button from '@material-ui/core/Button';
+import IconButton from '@material-ui/core/IconButton';
+import Icon from '../general/NetPyNEIcons';
+import { TOPBAR_CONSTANTS, MODEL_STATE } from '../../constants';
+import { Tooltip } from 'netpyne/components';
 
 const styles = ({ palette, shape, spacing, typography }) => ({ 
   container: {},
@@ -14,6 +15,7 @@ const styles = ({ palette, shape, spacing, typography }) => ({
     fontSize: '1rem',
     borderRadius: 0
   },
+  rocket: { marginRight: spacing(1) },
   icon: { color: palette.common.white },
 })
 
@@ -36,9 +38,32 @@ class SwitchPageButton extends Component {
   };
 
   render () {
-    const { classes } = this.props
+    const { classes, modelState, editModelPage } = this.props;
+    const disableSimulate = modelState === MODEL_STATE.SIMULATED;
     return (
       <div className={classes.container}>
+        {
+          editModelPage ? null
+        
+            : <Tooltip 
+              title={disableSimulate ? "You have already simulated the network" : "Simulate the network"} 
+              placement="left"
+            ><span>
+                <IconButton 
+                  color={'default'}
+                  id={"launchSimulationButton"}
+                  className={classes.rocket}
+                  size="small"
+                  onClick={() => this.props.simulateNetwork() } 
+                  disabled={disableSimulate}
+                  style={{ opacity: disableSimulate ? 0.5 : 1 }}
+                >
+                  <Icon name={"rocket"} />
+              
+                </IconButton>
+              </span>
+            </Tooltip>
+        }
         <Button
           variant="contained"
           size="small"

webapp/components/topbar/Topbar.js

@@ -155,7 +155,10 @@ class Topbar extends Component {
             configuration={toolbarConfig}
             menuHandler={this.menuHandler.bind(this)}
           />
-          <SwitchPageButton/>
+          <div>
+            
+            <SwitchPageButton/>
+          </div>
 
         </div>
         { this.props.modelLoaded ? null : <Splash/> }

webapp/tests/end2end-puppeteer/TestTutorial1.js

@@ -31,7 +31,7 @@ describe('Tutorial #1', () => {
 
 
       await page.waitForSelector('#CellType0')
-      await  page.waitFor(2000);
+      await page.waitFor(2000);
       await page.click('#CellType0')
 
       await page.waitForSelector('#cellRuleName')
@@ -40,7 +40,6 @@ describe('Tutorial #1', () => {
 
       await page.waitForSelector('#newSectionButton')
       await page.click('#newSectionButton')
-      
 
 
       await page.waitForSelector('input\[value="soma"\]')
@@ -64,13 +63,11 @@ describe('Tutorial #1', () => {
       await page.waitForSelector('input\[type="number"\]') // num cells, the default id #netParams\.popParams\[\'Population0\'\]\[\'numCells\'\] cannot be targeted
       await page.waitFor(1000);
       page.$eval('input\[type="number"\]', el => el.value = 30);
-    
 
 
       // await page.waitForSelector('#netParams\.popParams\[\'Population0\'\]\[\'cellType\'\]')
       // await page.waitFor(1000);
       // await page.click('#netParams\.popParams\[\'Population0\'\]\[\'cellType\'\]')
-     
 
 
       // await page.waitForSelector('.MuiSelect-nativeInput')