Merge pull request #550 from MetaCell/feature/447_final

Feature/447 final

Author: filippomc

Dockerfile

@@ -32,6 +32,9 @@ RUN npm install --global yarn
 RUN npm install --global yalc
 RUN python install.py ${BUILD_ARGS} --geppetto ${GEPPETTO_VERSION}
 
+# Temp fixes for eeg plots
+RUN wget -P `pip show LFPykit | grep "Location:" | awk '{print $2"/lfpykit"}'` https://www.parralab.org/nyhead/sa_nyhead.mat
+
 WORKDIR ${INSTALLATION_FOLDER}
 
 RUN pip install -r requirements-test.txt

netpyne_ui/netpyne_geppetto.py

@@ -824,7 +824,7 @@ def getAvailableCellTypes(self):
     def getAvailableRxDSections(self, selectedRegion):
         sections = set([])
         sections.add('all')
-        if self.netParams.rxdParams.regions[selectedRegion].get('cells'):
+        if selectedRegion in self.netParams.rxdParams.regions and self.netParams.rxdParams.regions[selectedRegion].get('cells'):
             if 'all' in self.netParams.rxdParams.regions[selectedRegion]['cells']:
                 for cellRule in self.netParams.cellParams:
                     for cellSect in self.netParams.cellParams[cellRule]['secs']:

requirements.txt

@@ -15,6 +15,7 @@ defusedxml==0.6.0
 Deprecated==1.2.10
 entrypoints==0.3
 future==0.18.2
+h5py==3.7.0
 idna==2.9
 ipython-genutils==0.2.0
 ipywidgets==7.5.1

webapp/components/experiments/ExperimentEdit.js

@@ -480,8 +480,9 @@ const ExperimentEdit = (props) => {
   };
 
   const setExperimentNameInfo = (val) => {
-    validateExperimentName(val);
-    setExperimentName(val);
+    const name = val.replace(' ', '_');
+    validateExperimentName(name);
+    setExperimentName(name);
   };
 
   return (

webapp/components/general/List.js

@@ -293,12 +293,14 @@ class ListComponent extends Component {
             <Box display="flex" alignItems="center" className={classes.addIcon}>
               <IconButton
                 id={`${this.props.id}-button`}
+                disabled={this.props.disabled}
               >
                 <Add onClick={this.addChild} />
               </IconButton>
             </Box>
             <TextField
               variant="filled"
+              disabled={this.props.disabled}
               id={this.props.id}
               label={
                 this.props.label ? `Add new ${this.props.label}` : 'Add new item'

webapp/components/rxd/Rxd.js

@@ -78,7 +78,7 @@ const styles = ((theme) => ({
     },
     '& .MuiTabs-scroller': {
       borderBottom: `0.0625rem solid ${navShadow}`,
-    }
+    },
   },
 
   button: {
@@ -276,6 +276,7 @@ class Rxd extends React.Component {
         <RxdRegions
           onAddRegion={this.onAddRegion}
           regions={controlledState?.checked?.regions}
+          extracellular={controlledState?.checked?.extracellular}
         />
       );
     } else if (value === 1) {
@@ -324,6 +325,7 @@ class Rxd extends React.Component {
       tabPanelContent = (
         <RxdExtracellulars
           onAddExtracellular={this.onAddExtracellular}
+          regions={controlledState?.checked?.regions}
           extracellular={controlledState?.checked?.extracellular}
         />
       );

webapp/components/rxd/RxdConstants.js

@@ -16,19 +16,6 @@ import AddIcon from '@material-ui/icons/Add';
 import FontIcon from '@material-ui/core/Icon';
 import Utils from '../../Utils';
 import {
-  bgDarkest,
-  bgLight,
-  bgRegular,
-  secondaryColor,
-  fontColor,
-  radius,
-  primaryColor,
-  experimentInputColor,
-  experimentFieldColor,
-  experimentSvgColor,
-  experimentLabelColor,
-  experimentAutocompleteBorder,
-  errorFieldBorder,
   tabsTextColor,
 } from '../../theme';