Fixes for cns related to Anaysis and interactive plots

Author: rodriguez-facundo

netpyne_ui/netpyne_geppetto.py

@@ -379,9 +379,9 @@ def rename(self, path, oldValue,newValue):
 
         return 1
 
-    def getPlotSettings(self, plot):
-        if self.simConfig.analysis and plot in self.simConfig.analysis:
-            return self.simConfig.analysis[plot]
+    def getPlotSettings(self, plot_name):
+        if self.simConfig.analysis and plot_name in self.simConfig.analysis:
+            return self.simConfig.analysis[plot_name]
         return {}
 
     def getDirList(self, dir=None, onlyDirs = False, filterFiles=False):
@@ -410,9 +410,15 @@ def getPlot(self, plotName, LFPflavour):
 
                 if plotName.startswith('iplot'):
                     html = getattr(analysis, plotName)(**args)
-                    if not html:
+                    if not html or html == -1:
                         return ""
-                    if (plotName == 'iplotRaster'):
+
+                    # some plots return "fig", some return "(fig, data)"
+                    if plotName == 'iplotRaster':
+                        html = html[0]
+                    elif plotName == 'iplotRxDConcentration':
+                        html = html[0]
+                    elif plotName == 'iplot2Dnet':
                         html = html[0]
                     return html
 

webapp/components/definition/plots/NetPyNENewPlot.js

@@ -40,65 +40,58 @@ export default class NetPyNENewPlot extends React.Component {
         onClose={() => this.setState({ anchorEl: null })}
       >
         <MenuItem 
-          key={"plotTraces"} 
-          value={"plotTraces"}
-          onClick={() => this.handleClick("plotTraces")} 
+          key={"iplotTraces"} 
+          value={"iplotTraces"}
+          onClick={() => this.handleClick("iplotTraces")} 
         >
             Traces Plot
         </MenuItem>
         <MenuItem 
-          key={"plotRaster"} 
-          value={"plotRaster"}
-          onClick={() => this.handleClick("plotRaster")} 
+          key={"iplotRaster"} 
+          value={"iplotRaster"}
+          onClick={() => this.handleClick("iplotRaster")} 
         >
             Raster Plot
         </MenuItem>
         <MenuItem 
-          key={"plotSpikeHist"}
-          value={"plotSpikeHist"}
-          onClick={() => this.handleClick("plotSpikeHist")} 
+          key={"iplotSpikeHist"}
+          value={"iplotSpikeHist"}
+          onClick={() => this.handleClick("iplotSpikeHist")} 
         >
             Spike Histogram Plot
         </MenuItem>
         <MenuItem 
-          key={"plotSpikeStats"} 
-          value={"plotSpikeStats"}
-          onClick={() => this.handleClick("plotSpikeStats")} 
+          key={"iplotSpikeStats"} 
+          value={"iplotSpikeStats"}
+          onClick={() => this.handleClick("iplotSpikeStats")} 
         >
             Spike Stats Plot
         </MenuItem>
         <MenuItem 
-          key={"plotRatePSD"} 
-          value={"plotRatePSD"}
-          onClick={() => this.handleClick("plotRatePSD")} 
+          key={"iplotRatePSD"} 
+          value={"iplotRatePSD"}
+          onClick={() => this.handleClick("iplotRatePSD")} 
         >
             PSD Rate Plot
         </MenuItem>
         <MenuItem 
-          key={"plotLFP"} 
-          value={"plotLFP"}
-          onClick={() => this.handleClick("plotLFP")} 
+          key={"iplotLFP"} 
+          value={"iplotLFP"}
+          onClick={() => this.handleClick("iplotLFP")} 
         >
             LFP Plot
         </MenuItem>
         <MenuItem 
-          key={"plotShape"} 
-          value={"plotShape"}
-          onClick={() => this.handleClick("plotShape")} 
-        >
-            3D Cell Shape Plot
-        </MenuItem>
-        <MenuItem 
-          key={"plot2Dnet"} 
-          value={"plot2Dnet"}
-          onClick={() => this.handleClick("plot2Dnet")} 
+          key={"iplot2Dnet"} 
+          value={"iplot2Dnet"}
+          onClick={() => this.handleClick("iplot2Dnet")} 
         >
             2D Network Plot
         </MenuItem>
         <MenuItem 
-          key={"plotConn"} 
-          value={"plotConn"}
-          onClick={() => this.handleClick("plotConn")} 
+          key={"iplotConn"} 
+          value={"iplotConn"}
+          onClick={() => this.handleClick("iplotConn")} 
         >
             Network Connectivity Plot
         </MenuItem>

webapp/components/definition/plots/NetPyNEPlots.js

@@ -3,7 +3,6 @@ import React, { Component } from 'react';
 import Utils from '../../../Utils';
 import PlotLFP from './plotTypes/PlotLFP';
 import PlotConn from './plotTypes/PlotConn';
-import PlotShape from './plotTypes/PlotShape';
 import Plot2Dnet from './plotTypes/Plot2Dnet';
 import PlotRaster from './plotTypes/PlotRaster';
 import PlotTraces from './plotTypes/PlotTraces';
@@ -47,11 +46,6 @@ export default class NetPyNEPlots extends React.Component {
         if (response.includes(plot)) {
           if (plot == "plotLFP") {
             var include = { 'electrodes': ['all'] }
-          } else if (plot == "plotShape") {
-            var include = {
-              'includePre': ['all'],
-              'includePost': ['all']
-            }
           } else if (plot == "granger") {
             var include = {
               'cells1': ['allCells'],
@@ -87,31 +81,28 @@ export default class NetPyNEPlots extends React.Component {
     }
 
     switch (this.state.selectedPlot) {
-    case "plotRaster":
+    case "iplotRaster":
       var selectedPlot = <PlotRaster />
       break;
-    case "plotSpikeHist":
+    case "iplotSpikeHist":
       var selectedPlot = <PlotSpikeHist />
       break;
-    case "plotSpikeStats":
+    case "iplotSpikeStats":
       var selectedPlot = <PlotSpikeStats />
       break;
-    case "plotRatePSD":
+    case "iplotRatePSD":
       var selectedPlot = <PlotRatePSD />
       break;
-    case "plotTraces":
+    case "iplotTraces":
       var selectedPlot = <PlotTraces />
       break;
-    case "plotLFP":
+    case "iplotLFP":
       var selectedPlot = <PlotLFP />
       break;
-    case "plotShape":
-      var selectedPlot = <PlotShape />
-      break;
-    case "plotConn":
+    case "iplotConn":
       var selectedPlot = <PlotConn />
       break;
-    case "plot2Dnet":
+    case "iplot2Dnet":
       var selectedPlot = <Plot2Dnet />
       break;
     case "granger":

webapp/components/definition/plots/plotTypes/Plot2Dnet.js

@@ -16,7 +16,7 @@ export default class Plot2Dnet extends React.Component {
   }
 
   render () {
-    var tag = "simConfig.analysis['plot2Dnet']"
+    const tag = "simConfig.analysis['iplot2Dnet']"
     return <div>
       <NetPyNEInclude
         id={"simConfig.analysis.plot2Dnet.include"}

webapp/components/definition/plots/plotTypes/PlotConn.js

@@ -15,7 +15,7 @@ export default class plotConn extends React.Component {
   }
 
   render () {
-    var tag = "simConfig.analysis['plotConn']"
+    var tag = "simConfig.analysis['iplotConn']"
     return <div>
       <NetPyNEInclude
         id={"simConfig.analysis.plotConn.include"}

webapp/components/definition/plots/plotTypes/PlotGranger.js

@@ -35,7 +35,7 @@ export default class PlotGranger extends React.Component {
         </NetPyNEField>
 
         <NetPyNEField id="simConfig.analysis.granger.label1" >
-          <NetPyNETextField vfullWidth ariant="filled" model={tags + "['label1']"}/>
+          <NetPyNETextField fullWidth ariant="filled" model={tags + "['label1']"}/>
         </NetPyNEField>
 
         <NetPyNEField id="simConfig.analysis.granger.label2" >

webapp/components/definition/plots/plotTypes/PlotLFP.js

@@ -16,7 +16,7 @@ export default class PlotLFP extends React.Component {
   }
 
   render () {
-    var tag = "simConfig.analysis['plotLFP']"
+    var tag = "simConfig.analysis['iplotLFP']"
     return <div>
       <NetPyNEField id="simConfig.analysis.plotLFP.electrodes" className="listStyle" >
         <ListComponent model={tag + "['electrodes']"} />

webapp/components/definition/plots/plotTypes/PlotRaster.js

@@ -23,7 +23,7 @@ export default class PlotRaster extends React.Component {
   };
 
   render () {
-    var tag = "simConfig.analysis['plotRaster']"
+    var tag = "simConfig.analysis['iplotRaster']"
     return <div>
       <NetPyNEInclude
         id={"simConfig.analysis.plotRaster.include"}

webapp/components/definition/plots/plotTypes/PlotRatePSD.js

@@ -16,7 +16,7 @@ export default class PlotRatePSD extends React.Component {
   }
 
   render () {
-    var tag = "simConfig.analysis['plotRatePSD']"
+    var tag = "simConfig.analysis['iplotRatePSD']"
     return <div>
       <NetPyNEInclude
         id={"simConfig.analysis.plotRatePSD.include"}