Merge branch 'feature/152' of https://github.com/MetaCell/NetPyNE-UI into feature/152

Author: ddelpiano

requirements.txt

@@ -10,8 +10,6 @@ certifi==2020.4.5.2
 certipy==0.1.3
 cffi==1.14.0
 chardet==3.0.4
-conda==4.8.2
-conda-package-handling==1.6.0
 cryptography==2.9.2
 cycler==0.10.0
 decorator==4.4.2
@@ -97,4 +95,4 @@ urllib3==1.25.9
 webencodings==0.5.1
 widgetsnbextension==3.5.1
 wrapt==1.12.1
-zipp==3.1.0
+zipp==3.1.0

webapp/components/topbar/menuConfiguration.js

@@ -61,21 +61,31 @@ const firstItemCustom = { fontWeight: 'bold', paddingLeft: `calc(${gutter} / 2)`
 
 const firstItemStyle = { standard: { ...topLevelMenuItemStyle.standard, ...firstItemCustom }, hover: { ...topLevelMenuItemStyle.hover, ...firstItemCustom } }
 
+
+const tutorialsList = {
+  "tut1": "Tut 1: Simple cell network",
+  "tut2": "Tut 2: Detailed cell network",
+  "tut3": "Tut 3: Multiscale network",
+  "tut3_ip3high": "Tut 3: Multiscale network (high IP3)"
+}
+
 export const getTutorials = () => {
   const { tuts } = window
   if (!tuts) {
     return []
   }
-  return tuts.sort().map(tutFile => (
-    {
-      label: tutFile.replace(".py", "").replace("gui", '').replace("_", " "),
+  return tuts.sort().map(tutFile => {
+    let tutName = tutFile.replace(".py", "").replace("gui", '').replace("_", "");
+    let tutLabel = tutorialsList[tutName] !== undefined ? tutorialsList[tutName] : tutName;
+    return {
+      label: tutLabel,
       icon: "",
       action: {
         handlerAction: "redux",
         parameters: [loadTutorial, tutFile]
       }
     }
-  ))
+  })
 
 }
 
@@ -338,15 +348,15 @@ export const getModelMenu = props => (
       label: "Explore view options",
       list: [
         {
-          label: "Automatic instantiation",
+          label: "Automatic creation",
           icon: props.automaticInstantiation ? checkedIcon : 'fa',
           action: {
             handlerAction: "redux",
             parameters: [changeAutomaticInstantiation, true]
           }
         },
         {
-          label: "Manual instantiation",
+          label: "Manual creation",
           icon: !props.automaticInstantiation ? checkedIcon : 'fa',
           action: {
             handlerAction: "redux",
@@ -374,4 +384,4 @@ export const getModelMenu = props => (
     },
 
   ]
-)
+)

webapp/constants.js

@@ -48,9 +48,9 @@ export const TOPBAR_CONSTANTS = {
   NEW_MODEL: 'NEW_MODEL',
   UPLOAD_FILES: 'UPLOAD_FILES',
   DOWNLOAD_FILES: 'DOWNLOAD_FILES',
-  CREATE_NETWORK: 'Instantiate',
-  CREATE_AND_SIMULATE_NETWORK:'Instantiate and simulate',
-  SIMULATE: 'Simulate',
+  CREATE_NETWORK: 'Create network',
+  CREATE_AND_SIMULATE_NETWORK:'Create and simulate network',
+  SIMULATE: 'Simulate network',
   EXPLORE_EXISTING_NETWORK:'Explore model',
   BACK_TO_EDITION: 'Back to edit',
   NEW_PAGE: 'NEW_PAGE'

webapp/redux/reducers/general.js

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