Merge pull request #145 from MetaCell/feature/143

Feature/143

Author: filippomc

netpyne_ui/netpyne_geppetto.py

@@ -496,11 +496,14 @@ def deleteParam(self, model, label):
                 else:
                     pass
             else:
-                population = getattr(self.netParams, model).pop(label)
+                # remove rule
+                rule = getattr(self.netParams, model).pop(label)
+
+                # side effect on other rules
                 if "popParams" in model:
                     self.propagate_field_rename("pop", None, label)
-                    self.propagate_field_rename("cellModel", None, population['cellModel'])
-                    self.propagate_field_rename("cellType", None, population['cellType'])
+                    self.propagate_field_rename("cellModel", None, rule['cellModel'])
+                    self.propagate_field_rename("cellType", None, rule['cellType'])
 
                 elif "stimSourceParams" in model:
 

utilities/install.py

@@ -82,15 +82,15 @@ def main(argv):
 clone_repo(project='openworm',
            repo_name='pygeppetto',
            folder='pygeppetto',
-           default_branch='development'
+           default_branch='master'
 )
 subprocess.call(['python3', '-m', 'pip', 'install', '-e', '.'], cwd='./pygeppetto/')
 
 
 clone_repo(project='openworm',
            repo_name='org.geppetto.frontend.jupyter',
            folder='org.geppetto.frontend.jupyter',
-           default_branch='development'
+           default_branch='master'
 )
 
 

webapp/Utils.js

@@ -1,4 +1,4 @@
-import { execPythonMessage, evalPythonMessage } from 'geppetto-client/js/communication/geppettoJupyter/GeppettoJupyterUtils';
+import { execPythonMessage, evalPythonMessage } from '@geppettoengine/geppetto-client/js/communication/geppettoJupyter/GeppettoJupyterUtils';
 import React from 'react';
 
 const Utils = {

webapp/components/definition/cellRules/NetPyNECellRule.js

@@ -101,6 +101,7 @@ export default class NetPyNECellRule extends React.Component {
             label="The name of the cell rule"
             className={"netpyneField"}
             id={"cellRuleName"}
+            style={{ marginTop: 8 }}
           />
 
           <div style={{ float: 'left', marginTop: '20px' }}>