Merge branch 'development' of github.com:MetaCell/NetPyNE-UI into osb2-dev

Author: filippomc

Dockerfile

@@ -54,8 +54,12 @@ RUN chown  $NB_UID .
 RUN chown -R $NB_UID workspace
 
 # Temp fixes for eeg plots
-RUN wget -P `pip show LFPykit | grep "Location:" | awk '{print $2"/lfpykit"}'` https://www.parralab.org/nyhead/sa_nyhead.mat
 ENV NEURON_HOME=/opt/conda
+# For lfpykit 0.4
+# RUN wget -P $(pip show LFPykit | grep "Location:" | awk '{print $2"/lfpykit"}') https://www.parralab.org/nyhead/sa_nyhead.mat
+# For lpfykit 0.5
+RUN wget --no-check-certificate -P ${FOLDER}/workspace https://www.parralab.org/nyhead/sa_nyhead.mat
+
 USER $NB_UID
 
 EXPOSE 8888

requirements.txt

@@ -34,6 +34,7 @@ jupyterthemes==0.20.0
 kiwisolver==1.2.0
 lesscpy==0.14.0
 libNeuroML==0.4.0
+lfpykit==0.5
 lxml==4.5.1
 Mako==1.1.0
 MarkupSafe==1.1.1

webapp/redux/middleware/plotMiddleware.js

@@ -35,9 +35,10 @@ const plotFigure = async (plotId, plotMethod, plotType = false, uri = null, them
       new Promise((resolve, reject) => {
         setTimeout(() => {
           resolve(null);
-        }, 30000);
+        }, 2 * 60 * 1000); // Timeout set to 2 minutes, previously, 30000 (30s)
       })]);
 
+    // let response = await Utils.evalPythonMessage(NETPYNE_COMMANDS.plotFigure, [plotMethod, plotType, theme], false)
     console.log('Plot response received for', plotId);
     if (!response && !uri) { //png plots return null response but they provide a uri so they can be grabbed from the workspace
       return null;