From 0a52997ed11925b0204acff2f604de1969d2dc10 Mon Sep 17 00:00:00 2001 From: Alix Damman Date: Mon, 27 Nov 2017 14:41:07 +0100 Subject: [PATCH 1/2] fix #121 : set `changes` attribute of DataModel and Adapter to an empty dict by default. Methods `new` and `open` in MappingEditor failed because Adapter.update_changes() was called before attribute changes was set (and so was equal to None). --- larray_editor/arrayadapter.py | 4 ++-- larray_editor/arraymodel.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/larray_editor/arrayadapter.py b/larray_editor/arrayadapter.py index 32d8f380..1dc7f00e 100644 --- a/larray_editor/arrayadapter.py +++ b/larray_editor/arrayadapter.py @@ -15,8 +15,8 @@ def __init__(self, axes_model, xlabels_model, ylabels_model, data_model): self.data_model = data_model # these are not valid values, but should overwritten by set_data which must be called before the adapter is used - self.current_filter = None - self.changes = None + self.current_filter = {} + self.changes = {} self.la_data = None self.bg_value = None self.filtered_data = None diff --git a/larray_editor/arraymodel.py b/larray_editor/arraymodel.py index f6dbb1a4..0654fc7b 100644 --- a/larray_editor/arraymodel.py +++ b/larray_editor/arraymodel.py @@ -210,7 +210,7 @@ def __init__(self, parent=None, readonly=False, format="%.3f", font=None, minval self.minvalue = minvalue self.maxvalue = maxvalue - self.changes = None + self.changes = {} self.color_func = None self.vmin = None From abebf39c7ce2e608a57aae1e7a7f728bc0cd899b Mon Sep 17 00:00:00 2001 From: Alix Damman Date: Mon, 27 Nov 2017 17:07:19 +0100 Subject: [PATCH 2/2] removed meaningless comment above self.current_filter in Adapter.init --- larray_editor/arrayadapter.py | 1 - 1 file changed, 1 deletion(-) diff --git a/larray_editor/arrayadapter.py b/larray_editor/arrayadapter.py index 1dc7f00e..a8f44f41 100644 --- a/larray_editor/arrayadapter.py +++ b/larray_editor/arrayadapter.py @@ -14,7 +14,6 @@ def __init__(self, axes_model, xlabels_model, ylabels_model, data_model): self.ylabels_model = ylabels_model self.data_model = data_model - # these are not valid values, but should overwritten by set_data which must be called before the adapter is used self.current_filter = {} self.changes = {} self.la_data = None