Merge pull request #547 from MetaCell/feature/213

Feature/213

Author: filippomc

netpyne_ui/netpyne_geppetto.py

@@ -54,6 +54,7 @@ def __init__(self):
         self.netParams = specs.NetParams()
         self.simConfig = specs.SimConfig()
         self.run_config = model.RunConfig()
+        self.simConfig.recordTraces = {'V_soma': {'sec':'soma', 'loc':0.5, 'var':'v'}}
 
         self.experiments = experiments
 
@@ -68,7 +69,7 @@ def __init__(self):
         experiments.get_experiments()
         running_exps = experiments.get_by_states([
             model.ExperimentState.PENDING,
-            model.ExperimentState.SIMULATING, 
+            model.ExperimentState.SIMULATING,
             model.ExperimentState.INSTANTIATING
         ])
         if not simulations.local.is_running():
@@ -435,9 +436,10 @@ def loadModel(self, args):
                     if self.doIhaveInstOrSimData()['haveInstance']:
                         sim.clearAll()
                     sim.initialize()
-                    sim.loadAll(args['jsonModelFolder'])
+                    sim.loadAll(args['jsonModelFolder'], instantiate=False)
                     self.netParams = sim.net.params
                     self.simConfig = sim.cfg
+                    self.simConfig.saveCellSecs = True
                     netpyne_ui_utils.remove(self.netParams.todict())
                     netpyne_ui_utils.remove(self.simConfig.todict())
                 else:

webapp/components/topbar/SwitchPageButton.js

@@ -73,7 +73,7 @@ class SwitchPageButton extends Component {
       editModelPage,
       modelState
     } = this.props;
-    const instantiated = modelState == MODEL_STATE.INSTANTIATED ;
+    const instantiated = modelState == MODEL_STATE.INSTANTIATED;
     return (
       <div className={classes.container}>
         {editModelPage
@@ -88,14 +88,14 @@ class SwitchPageButton extends Component {
                 { BACK_TO_EXPLORER }
               </Button>
               <SplitButton
-                options={instantiated ? instantiatedEditOptions : editOptions }
+                options={instantiated ? instantiatedEditOptions : editOptions}
                 handleClick={(selectedOption) => this.handleClick(selectedOption)}
                 icon={(
                   <span style={{ marginRight: '5px' }}>
                     <Icon name="rocket" />
                   </span>
                 )}
-                skipIconFor={ CREATE_NETWORK }
+                skipIconFor={CREATE_NETWORK}
               />
             </>
           )
@@ -116,6 +116,7 @@ class SwitchPageButton extends Component {
                     <Icon name="rocket" />
                   </span>
                 )}
+                skipIconFor={SIMULATE}
               />
             </>
           )}