From 49a6bd22ae9595ee3328e37db1c6f5832c9c6b82 Mon Sep 17 00:00:00 2001 From: Ivan Usov Date: Wed, 8 Sep 2021 14:05:57 +0200 Subject: [PATCH] Merge datasets in param_study --- pyzebra/app/panel_param_study.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pyzebra/app/panel_param_study.py b/pyzebra/app/panel_param_study.py index 5cff64a..c10b18c 100644 --- a/pyzebra/app/panel_param_study.py +++ b/pyzebra/app/panel_param_study.py @@ -151,9 +151,10 @@ def create(): if f_ind == 0: # first file det_data = file_data + pyzebra.merge_duplicates(det_data) js_data.data.update(fname=[base]) else: - det_data.extend(file_data) + pyzebra.merge_datasets(det_data, file_data) _init_datatable() append_upload_button.disabled = False @@ -168,7 +169,7 @@ def create(): file_data = pyzebra.parse_1D(file, ext) pyzebra.normalize_dataset(file_data, monitor_spinner.value) - det_data.extend(file_data) + pyzebra.merge_datasets(det_data, file_data) _init_datatable() @@ -187,9 +188,10 @@ def create(): if f_ind == 0: # first file det_data = file_data + pyzebra.merge_duplicates(det_data) js_data.data.update(fname=[base]) else: - det_data.extend(file_data) + pyzebra.merge_datasets(det_data, file_data) _init_datatable() append_upload_button.disabled = False @@ -205,7 +207,7 @@ def create(): file_data = pyzebra.parse_1D(file, ext) pyzebra.normalize_dataset(file_data, monitor_spinner.value) - det_data.extend(file_data) + pyzebra.merge_datasets(det_data, file_data) _init_datatable()