Merge branch 'development' of https://github.com/MetaCell/netpyne-ui into feature/213

Author: ddelpiano

netpyne_ui/netpyne_geppetto.py

@@ -89,7 +89,7 @@ def getData(self):
 
     def getModelAsJson(self):
         # TODO: netpyne should offer a method asJSON (#240)
-        #  that returns the JSON model without dumping to to disk.
+        # that returns the JSON model without dumping to to disk.
         obj = netpyne_utils.replaceFuncObj(self.netParams.__dict__)
         obj = netpyne_utils.replaceDictODict(obj)
         return obj
@@ -275,7 +275,7 @@ def simulateNetPyNEModelInGeppetto(self, args):
             if experiment:
                 if self.experiments.any_in_state([model.ExperimentState.PENDING, model.ExperimentState.SIMULATING]):
                     return utils.getJSONError("Experiment is already simulating or pending", "")
-                
+
                 if simulations.local.is_running():
                     simulations.local.stop()
 
@@ -285,7 +285,7 @@ def simulateNetPyNEModelInGeppetto(self, args):
                     if allTrials:
                         if len(experiment.trials) == 1 and experiment.trials[0].id == experiments.BASE_TRIAL_ID:
                             # special case where we don't want to run a batch simulation
-                            return self.simulate_single_model(experiment, use_prev_inst)    
+                            return self.simulate_single_model(experiment, use_prev_inst)
                         else:
                             return self.simulate_experiment_trials(experiment)
                     else:
@@ -808,9 +808,37 @@ def getAvailableSections(self):
             sections[cellRule] = list(self.netParams.cellParams[cellRule]['secs'].keys())
         return sections
 
+    def getAvailableCellTypes(self):
+        cell_types = set([])
+        cell_types.add('all')
+        for p in self.netParams.cellParams:
+            cell_types.add(p)
+        return sorted(cell_types)
+
+    def getAvailableRxDSections(self, selectedRegion):
+        sections = set([])
+        sections.add('all')
+        if 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']:
+                        sections.add(cellSect)
+            else:
+                for cellRule in self.netParams.cellParams:
+                    if cellRule in self.netParams.rxdParams.regions[selectedRegion]['cells']:
+                        for cellSect in self.netParams.cellParams[cellRule]['secs']:
+                            sections.add(cellSect)
+        return sorted(sections)
+
     def getAvailableStimSources(self):
         return list(self.netParams.stimSourceParams.keys())
 
+    def getAvailableRxdRegions(self):
+        return list(self.netParams.rxdParams.regions.keys())
+
+    def getAvailableRxdSpecies(self):
+        return list(self.netParams.rxdParams.species.keys())
+
     def getAvailableSynMech(self):
         return list(self.netParams.synMechParams.keys())
 

webapp/components/general/NetPyNEField.js

@@ -11,6 +11,7 @@ export default class NetPyNEField extends Component {
     super(props);
     this.state = { open: false };
   }
+
   setErrorMessage (value) {
     return new Promise((resolve, reject) => {
       if (this.realType === REAL_TYPE.FUNC) {
@@ -52,7 +53,7 @@ export default class NetPyNEField extends Component {
   }
 
   handleTooltip (action) {
-    this.setState({ open:  action});
+    this.setState({ open: action });
   }
 
   render () {
@@ -136,10 +137,13 @@ export default class NetPyNEField extends Component {
                 disableFocusListener
                 open={this.state.open}
               >
-                <Box mb={1} width="100%"
-                  onMouseEnter= {() => { this.handleTooltip(true) }}
-                  onMouseLeave = { () => { this.handleTooltip(false) }}
-                  onClick={ () => { this.handleTooltip(false) }}>
+                <Box
+                  mb={1}
+                  width="100%"
+                  onMouseEnter={() => { this.handleTooltip(true); }}
+                  onMouseLeave={() => { this.handleTooltip(false); }}
+                  onClick={() => { this.handleTooltip(false); }}
+                >
                   {childWithProp}
                 </Box>
               </Tooltip>

webapp/components/general/PythonControlledCapability.js

@@ -420,16 +420,19 @@ define((require) => {
         }
 
         callPythonMethod = (value) => {
-          GeppettoUtils.evalPythonMessage(this.props.method, [])
-            .then((response) => {
-              if (this._isMounted) {
-                if (Object.keys(response).length !== 0) {
-                  this.setState({ pythonData: response });
-                } else {
-                  this.setState({ pythonData: [] });
+          const params = this.props?.pythonParams || [];
+          if (this.props.method) {
+            GeppettoUtils.evalPythonMessage(this.props.method, params)
+              .then((response) => {
+                if (this._isMounted) {
+                  if (Object.keys(response).length !== 0) {
+                    this.setState({ pythonData: response });
+                  } else {
+                    this.setState({ pythonData: [] });
+                  }
                 }
-              }
-            });
+              });
+          }
         };
 
         componentDidUpdate (prevProps, prevState) {

webapp/components/general/Select.js

@@ -21,6 +21,7 @@ class Select extends React.Component {
           value={value}
           onChange={this.props.onChange}
           multiple={!!this.props.multiple}
+          pythonParams={this.props.pythonParams}
         >
           {this.props.children}
         </MuiSelect>

webapp/components/icons.jsx

@@ -68,6 +68,7 @@ import _LaunchDialog from './topbar/dialogs/LaunchDialog';
 import _NetPyNEPythonConsole from './general/NetPyNEPythonConsole';
 import _PlotViewer from './general/PlotViewer';
 import _ExperimentControlPanel from './general/ExperimentControlPanel';
+import _Rxd from './rxd/Wrapper';
 
 const updateCardsDispatch = (dispatch) => ({ updateCards: () => dispatch(updateCards) });
 
@@ -388,6 +389,15 @@ export const SelectCellTemplate = connect(
   }),
 )(_SelectCellTemplate);
 
+export const Rxd = connect(
+  null,
+  updateCardsDispatch,
+)(
+  PythonControlledCapability.createPythonControlledComponent(
+    _Rxd,
+  ),
+);
+
 // ---------------------------------------------------------------------------------------- //
 
 // DEFAULTS

webapp/components/index.js

@@ -13,6 +13,7 @@ import {
   NetPyNEPythonConsole,
   ExperimentManager,
   ExperimentControlPanel,
+  Rxd,
 } from '..';
 
 import PlotViewer from '../general/PlotViewer';
@@ -36,6 +37,7 @@ const componentMap = {
   'analysis': NetPyNEPlots,
   'experimentManager': ExperimentManager,
   'experimentControlPanel': ExperimentControlPanel,
+  'rxd': Rxd,
 };
 
 export default componentMap;