Merge pull request #70 from MetaCell/plotinclude

change plot.include component

Author: adrianq

netpyne_ui/netpyne_geppetto.py

@@ -445,8 +445,33 @@ def getMechParams(self, mechanism):
 
     def getAvailablePlots(self):
         plots  = ["plotRaster", "plotSpikeHist", "plotSpikeStats","plotRatePSD", "plotTraces", "plotLFP", "plotShape", "plot2Dnet", "plotConn", "granger"]
+
         return [plot for plot in plots if plot not in list(self.simConfig.analysis.keys())]
 
+    def getInclude(self, model):
+        with redirect_stdout(sys.__stdout__):
+            if model in list(netpyne_geppetto.simConfig.analysis.keys()):
+                if 'include' in list(netpyne_geppetto.simConfig.analysis[model].keys()):
+                    return netpyne_geppetto.simConfig.analysis[model]['include']
+                else:
+                    return False
+            else:
+                return False
+
+    def getGIDs(self):
+        # pop sizes and gids returned in a dict
+        out = {}
+        with redirect_stdout(sys.__stdout__):
+            for key in self.netParams.popParams.keys():
+                if 'numCells' in self.netParams.popParams[key]:
+                    out[key] = self.netParams.popParams[key]['numCells']
+                else:
+                    out[key] = 0
+
+            out['gids'] = int(np.sum([v for k, v in list(out.items())]))
+
+        return out
+        
     def deleteParam(self, model, label):
         try:
             if isinstance(model, list): # just for cellParams
@@ -522,26 +547,48 @@ def header(title, spacer='-'):
             return utils.getJSONError("Error while importing the NetPyNE model", sys.exc_info())
 
 
-    def propagate(self, obj, label, cond, new, old):
-        for key in obj.keys():
-            if label in list(obj[key][cond].keys()):
-                if isinstance(obj[key][cond][label], str):
-                    if old==obj[key][cond][label]:
-                        if new=='' or new==None: 
-                            obj[key].pop(label) 
-                        else: 
-                            obj[key][cond][label] = new
-
-                elif isinstance(obj[key][cond][label], list):
-                    if old in obj[key][cond][label]:
-                        if new=='' or new==None:
-                            obj[key][cond][label] = [ value for value in obj[key][cond][label] if value!=old]
+    def propagate(self, model, label, cond, new, old):
+        with redirect_stdout(sys.__stdout__):
+            if model == 'analysis':
+                analysis = getattr(self.simConfig, model)
+                for plot in analysis.keys():
+                    if cond in analysis[plot].keys():
+                        for index, item in enumerate(analysis[plot][cond]):
+                            if isinstance(item, str):
+                                if item == old:
+                                    if new == None:
+                                        analysis[plot][cond].remove(item)
+                                        break
+                                    else:
+                                        analysis[plot][cond][index] = new
+                            else:
+                                if isinstance(item[0], str):
+                                    if item[0] == old:
+                                        if new == None:
+                                            analysis[plot][cond].pop(index)
+                                            break
+                                        else:
+                                            analysis[plot][cond][index] = [new, item[1]]
+            else:
+                obj = getattr(self.netParams, model)
+                for key in obj.keys():
+                    if label in list(obj[key][cond].keys()):
+                        if isinstance(obj[key][cond][label], str):
+                            if old==obj[key][cond][label]:
+                                if new=='' or new==None: 
+                                    obj[key].pop(label) 
+                                else: 
+                                    obj[key][cond][label] = new
+                        elif isinstance(obj[key][cond][label], list):
+                            if old in obj[key][cond][label]:
+                                if new=='' or new==None:
+                                    obj[key][cond][label] = [ value for value in obj[key][cond][label] if value!=old]
+                                else:
+                                    obj[key][cond][label] = [ value if value!=old else new for value in obj[key][cond][label] ]
+                            if len(obj[key][cond][label])==0:
+                                obj[key][cond].pop(label)
                         else:
-                            obj[key][cond][label] = [ value if value!=old else new for value in obj[key][cond][label] ]
-                    if len(obj[key][cond][label])==0:
-                        obj[key][cond].pop(label)
-                else:
-                    pass
+                            pass
 
     def propagate_field_rename(self, label, new, old):
         def unique(label=label, old=old):
@@ -562,8 +609,8 @@ def unique(label=label, old=old):
             return True
         else:
             if unique():    
-                for (model, cond) in [['cellParams','conds'], ['connParams', 'preConds'], ['connParams', 'postConds'], ['stimTargetParams', 'conds']]: 
-                    self.propagate(getattr(self.netParams, model), label, cond, new, old)
+                for (model, cond) in [['cellParams','conds'], ['connParams', 'preConds'], ['connParams', 'postConds'], ['stimTargetParams', 'conds'], ['analysis', 'include'] ]: 
+                    self.propagate(model, label, cond, new, old)
                 return True
             else:
                 return False