From e722c156d3938876c80f94bc0cababe86b007fa0 Mon Sep 17 00:00:00 2001 From: rodriguez-facundo Date: Fri, 28 Feb 2020 10:57:16 -0300 Subject: [PATCH] Use redux --- .gitignore | 5 ++++- netpyne_ui/netpyne_geppetto.py | 16 ++++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 92919c3c..ddfa6ae8 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,7 @@ pygeppetto/ netpyne/ org.geppetto.frontend.jupyter/ *.ipynb -init.py \ No newline at end of file +init.py +npm* +.vscode +app.log \ No newline at end of file diff --git a/netpyne_ui/netpyne_geppetto.py b/netpyne_ui/netpyne_geppetto.py index bb5e41a8..2e52279e 100644 --- a/netpyne_ui/netpyne_geppetto.py +++ b/netpyne_ui/netpyne_geppetto.py @@ -59,7 +59,7 @@ def instantiateNetPyNEModelInGeppetto(self, args): netpyne_model = self.instantiateNetPyNEModel() self.geppetto_model = self.model_interpreter.getGeppettoModel(netpyne_model) - return json.loads(GeppettoModelSerializer().serialize(self.geppetto_model)) + return json.loads(GeppettoModelSerializer.serialize(self.geppetto_model)) except: return utils.getJSONError("Error while instantiating the NetPyNE model", sys.exc_info()) @@ -185,7 +185,7 @@ def remove(dictionary): sim.loadSimData(args['jsonModelFolder']) self.geppetto_model = self.model_interpreter.getGeppettoModel(sim) - return json.loads(GeppettoModelSerializer().serialize(self.geppetto_model)) + return json.loads(GeppettoModelSerializer.serialize(self.geppetto_model)) else: return utils.getJSONReply() except: @@ -281,7 +281,7 @@ def importNeuroML(self, modelParams): sim.initialize() sim.importNeuroML2(modelParams['neuroMLFolder'], simConfig=specs.SimConfig(), simulate=False, analyze=False) self.geppetto_model = self.model_interpreter.getGeppettoModel(sim) - return json.loads(GeppettoModelSerializer().serialize(self.geppetto_model)) + return json.loads(GeppettoModelSerializer.serialize(self.geppetto_model)) except: return utils.getJSONError("Error while exporting the NetPyNE model", sys.exc_info()) @@ -482,10 +482,14 @@ def deleteParam(self, model, label): else: pass else: - getattr(self.netParams, model).pop(label) + population = getattr(self.netParams, model).pop(label) 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']) + elif "stimSourceParams" in model: + self.propagate_field_rename("source", None, label) elif "synMechParams" in model: self.propagate_field_rename("synMech", None, label) @@ -596,7 +600,7 @@ def unique(label=label, old=old): for p in self.netParams.popParams: if label in self.netParams.popParams[p]: classes.append(self.netParams.popParams[p][label]) - if classes.count(old)>1: + if classes.count(old) > 0: return False else: return True @@ -608,7 +612,7 @@ def unique(label=label, old=old): self.propagate_syn_mech_rename(new, old) return True else: - if unique(): + if unique(): for (model, cond) in [['cellParams','conds'], ['connParams', 'preConds'], ['connParams', 'postConds'], ['stimTargetParams', 'conds'], ['analysis', 'include'] ]: self.propagate(model, label, cond, new, old) return True