Merge branch 'precns' of github.com:MetaCell/NetPyNE-UI into precns

Author: filippomc

webapp/components/definition/cellRules/NetPyNECellRules.js

@@ -544,16 +544,34 @@ export default class NetPyNECellRules extends React.Component {
 
   getCopyPath () {
     const basePath = "netParams.cellParams"
+    const { value:model } = this.state
+    const { selectedCellRule, selectedSection, selectedMechanism } = this.state
+    if (!model) {
+      return 'undefined'
+    }
     switch (this.state.page) {
-    case "main":
-      return `${basePath}["${this.state.selectedCellRule}"]`
-    case "sections":
-      return `${basePath}["${this.state.selectedCellRule}"].secs["${this.state.selectedSection}"]`
-    case "mechanisms":
-      return `${basePath}["${this.state.selectedCellRule}"].secs["${this.state.selectedSection}"].mechs["${this.state.selectedMechanism}"]`
-    default:
-      return "undefined"
+    case "main": {
+      if (model[selectedCellRule]) {
+        return `${basePath}["${selectedCellRule}"]`
+      }
+      break
+    }
+    case "sections": {
+      if (model[selectedCellRule].secs[selectedSection]) {
+        return `${basePath}["${selectedCellRule}"].secs["${selectedSection}"]`
+      }
+      break
+    }
+    case "mechanisms":{
+      if (model[selectedCellRule].secs[selectedSection].mechs[selectedMechanism]) {
+        return `${basePath}["${selectedCellRule}"].secs["${selectedSection}"].mechs["${selectedMechanism}"]`
+      }
+      break
+    }
+    default: {
+    }
     }
+    return "undefined"
   }
 
   callbackForNewCellTypeCreated (newCellTypeName) {

webapp/components/definition/connectivity/NetPyNEConnectivityRules.js

@@ -154,6 +154,11 @@ export default class NetPyNEConnectivityRules extends Component {
     return true;
   }
 
+  getCopyPath (){
+    const { value: model, selectedConnectivityRule } = this.state
+    return model && model[selectedConnectivityRule] && `netParams.connParams["${selectedConnectivityRule}"]`
+  }
+
   render () {
     var actions = [
       <Button
@@ -226,7 +231,7 @@ export default class NetPyNEConnectivityRules extends Component {
 
             </div>
             <Divider />
-            <RulePath text={`netParams.connParams["${this.state.selectedConnectivityRule}"]`}/>
+            <RulePath text={this.getCopyPath()}/>
             <Divider />
             <Filter
               value={this.state.filterValue}

webapp/components/definition/populations/NetPyNEPopulations.js

@@ -154,6 +154,11 @@ export default class NetPyNEPopulations extends React.Component {
     return true;
   }
 
+  getPath () {
+    const { value: model, selectedPopulation } = this.state
+    return model && model[selectedPopulation] && `netParams.popParams["${selectedPopulation}"]`
+  }
+
   render () {
     var actions = [
       <Button
@@ -229,7 +234,7 @@ export default class NetPyNEPopulations extends React.Component {
 
             </div>
             <Divider />
-            <RulePath text={`netParams.popParams["${this.state.selectedPopulation}"]`}/>
+            <RulePath text={this.getPath()}/>
             <Divider />
             <Filter
               value={this.state.filterPopValue}

webapp/components/definition/stimulationSources/NetPyNEStimulationSources.js

@@ -134,6 +134,11 @@ export default class NetPyNEStimulationSources extends Component {
     return true;
   }
 
+  getPath () {
+    const { value: model, selectedStimulationSource } = this.state
+    return model && model[selectedStimulationSource] && `netParams.stimSourceParams["${selectedStimulationSource}"]`
+  }
+
   render () {
     var actions = [
       <Button
@@ -202,7 +207,7 @@ export default class NetPyNEStimulationSources extends Component {
               </div>
             </div>
             <Divider />
-            <RulePath text={`netParams.stimSourceParams["${this.state.selectedStimulationSource}"]`}/>
+            <RulePath text={this.getPath()}/>
             <Divider />
             <Filter
               value={this.state.filterValue}

webapp/components/definition/stimulationTargets/NetPyNEStimulationTarget.js

@@ -62,9 +62,13 @@ export default class NetPyNEStimulationTarget extends React.Component {
 
   async isStimSourceTypeNetStim (stimSourceName) {
     var isNetStim = false
+    const { name: stimName } = this.props
     if (stimSourceName === undefined) {
       try {
-        stimSourceName = await Utils.evalPythonMessage("netpyne_geppetto.netParams.stimTargetParams['" + this.props.name + "']['source']")
+        const NETPYNE_OBJ = "netpyne_geppetto.netParams.stimTargetParams"
+        const STIM_TARGET_OBJ = `${NETPYNE_OBJ}['${stimName}']`
+        const SAFE_QUERY = `${STIM_TARGET_OBJ}['source'] if "${stimName}" in ${NETPYNE_OBJ} and "source" in ${STIM_TARGET_OBJ} else ''`
+        stimSourceName = await Utils.evalPythonMessage(SAFE_QUERY)
       } catch (error){
         console.log(error)
       }

webapp/components/definition/stimulationTargets/NetPyNEStimulationTargets.js

@@ -44,7 +44,7 @@ export default class NetPyNEStimulationTargets extends Component {
     var defaultStimulationTargets = { 'stim_target': { 'source': '', 'conds': {} } };
     var key = Object.keys(defaultStimulationTargets)[0];
     var value = defaultStimulationTargets[key];
-    var model = this.state.value;
+    var model = { ...this.state.value };
     var StimulationTargetId = Utils.getAvailableKey(model, key);
     var newStimulationTarget = Object.assign({ name: StimulationTargetId }, value);
     Utils.execPythonMessage('netpyne_geppetto.netParams.stimTargetParams["' + StimulationTargetId + '"] = ' + JSON.stringify(value));
@@ -133,6 +133,11 @@ export default class NetPyNEStimulationTargets extends Component {
     return true;
   }
 
+  getPath () {
+    const { value: model, selectedStimulationTarget } = this.state
+    return model && model[selectedStimulationTarget] && `netParams.stimTargetParams["${selectedStimulationTarget}"]`
+  }
+
   render () {
     var actions = [
       <Button
@@ -198,7 +203,7 @@ export default class NetPyNEStimulationTargets extends Component {
 
             </div>
             <Divider />
-            <RulePath text={`netParams.stimTargetParams["${this.state.selectedStimulationTarget}"]`}/>
+            <RulePath text={this.getPath()}/>
             <Divider />
             <Filter
               value={this.state.filterValue}

webapp/components/definition/synapses/NetPyNESynapses.js

@@ -133,6 +133,12 @@ export default class NetPyNESynapses extends Component {
     return true;
   }
 
+
+  getPath () {
+    const { value: model, selectedSynapse } = this.state
+    return model && model[selectedSynapse] && `netParams.synMechParams["${selectedSynapse}"]`
+  }
+
   render () {
     var actions = [
       <Button
@@ -198,7 +204,7 @@ export default class NetPyNESynapses extends Component {
 
             </div>
             <Divider />
-            <RulePath text={`netParams.synMechParams["${this.state.selectedSynapse}"]`}/>
+            <RulePath text={this.getPath()}/>
             <Divider />
             <Filter
               value={this.state.filterValue}

webapp/redux/middleware/middleware.js

@@ -154,6 +154,9 @@ const createSimulateBackendCall = async (cmd, payload, consoleMessage, spinnerTy
     throw new Error(responsePayload.errorMessage);
   } else {
     GEPPETTO.trigger(GEPPETTO.Events.Show_spinner, GEPPETTO.Resources.PARSING_MODEL);
+    
+    dehydrateCanvas()
+
     GEPPETTO.Manager.loadModel(response);
     GEPPETTO.CommandController.log('Instantiation / Simulation completed.');
 
@@ -178,3 +181,13 @@ const pythonCall = async ({ cmd, args }) => {
   } 
   return response;
 }
+
+
+const dehydrateCanvas = () => {
+  if ('CanvasContainer' in window) {
+    CanvasContainer.engine.reset()
+    Object.values(CanvasContainer.engine.meshes).forEach(mesh => {
+      CanvasContainer.engine.removeObject(mesh)
+    })
+  }
+}