Merge pull request #367 from MetaCell/feature/357_stop_network_creation

Feature/357 stop network creation

Author: Lucas Rebscher

netpyne_ui/netpyne_geppetto.py

@@ -429,7 +429,7 @@ def getPlot(self, plotName, LFPflavour, theme='gui'):
                     # This arg brings dark theme. But some plots are broken by it
                     args['theme'] = theme
 
-                    if plotName in ("iplotConn", "iplot2Dnet") and sim.net.allCells:
+                    if plotName in ("iplotConn", "iplot2Dnet") and hasattr(sim, 'net') and sim.net.allCells:
                         # To prevent unresponsive kernel, we don't show conns if they become too many
                         num_conn = sum([len(cell.conns) for cell in sim.net.allCells if cell.conns])
                         if num_conn > NUM_CONN_LIMIT:

package-lock.json

@@ -72,7 +72,7 @@ export default class NetPyNEInstantiated extends React.Component {
   };
 
   updateInstances () {
-    if (Instances.network) {
+    if (window.Instances != null && window.Instances.network) {
       // update canvas only if there are instances to show
       this.canvasRef.current.engine.setLinesThreshold(25000);
       this.canvasRef.current.engine.updateSceneWithNewInstances(

webapp/components/instantiation/NetPyNEInstantiated.js

@@ -279,14 +279,15 @@ export default {
 };
 
 export const getViewMenu = (props) => {
-  const instantiate = props.automaticInstantiation || props.modelState === MODEL_STATE.NOT_INSTANTIATED;
   const networkAction = () => {
-    if (instantiate && props.automaticSimulation) {
+    if (props.automaticInstantiation && props.automaticSimulation) {
       return createAndSimulateNetwork;
     }
-    if (instantiate) {
+
+    if (props.automaticInstantiation) {
       return createNetwork;
     }
+
     return showNetwork;
   };
 

webapp/components/topbar/menuConfiguration.js

@@ -12,7 +12,7 @@ export const GENERAL_DEFAULT_STATE = {
   dialogTitle: '',
   dialogMessage: '',
   automaticSimulation: false,
-  automaticInstantiation: true,
+  automaticInstantiation: false,
   theme: 'gui',
 };