Skip to content

#518 fix: Fix "Save to json" ignored options #613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ddelpiano merged 1 commit into from
Feb 1, 2023
Merged

#518 fix: Fix "Save to json" ignored options #613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions netpyne_ui/netpyne_geppetto.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ def simulate_single_model(self, experiment: model.Experiment = None, use_prev_in
netpyne_model = self.instantiateNetPyNEModel()

self.geppetto_model = self.model_interpreter.getGeppettoModel(netpyne_model)

simulations.run()

if self.geppetto_model:
Expand Down Expand Up @@ -374,7 +374,7 @@ def _prepare_simulation_files(self, experiment: model.Experiment = None, use_pre

def _prepare_batch_files(self, experiment: model.Experiment) -> str:
"""Creates template files and netpyne model files in the experiment folder.

Only for an experiment consisting of many trials.

:param experiment: given experiment
Expand Down Expand Up @@ -599,7 +599,8 @@ def exportModel(self, args):
if not args['netCells']:
sim.initialize(netParams=self.netParams, simConfig=self.simConfig)
sim.cfg.filename = args['fileName']
include = [el for el in specs.SimConfig().saveDataInclude if el in args.keys() and args[el]]
sim_config_data_include = specs.SimConfig().saveDataInclude
include = [el for el in sim_config_data_include if args.get(el, False)]
if args['netCells']: include += ['netPops']
sim.cfg.saveJson = True
sim.saveData(include)
Expand Down
8 changes: 4 additions & 4 deletions webapp/components/topbar/dialogs/SaveFile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,22 @@ const saveOptions = [
{
label: 'High-level Network Parameters (netParams)',
label2: 'Cell rules, connectivity rules, etc',
state: 'loadNetParams',
state: 'netParams',
},
{
label: 'Simulation Configuration (simConfig)',
label2: 'duration, recorded variables, etc',
state: 'loadSimCfg',
state: 'simConfig',
},
{
label: 'Instantiated Network',
label2: 'All cells, connections, etc',
state: 'loadNet',
state: 'netCells',
},
{
label: 'Simulation Data',
label2: 'Spikes, traces, etc',
state: 'loadSimData',
state: 'simData',
},
];

Expand Down