Skip to content

Commit 8c552a3

Browse files
committed
fixed digits not being updated when changing filters
this isn't so bad but it caused an exception which combined with #58 crashed the viewer and THAT is bad
1 parent 643c620 commit 8c552a3

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

larray_editor/arrayadapter.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77

88
class LArrayDataAdapter(object):
9-
109
def __init__(self, axes_model, xlabels_model, ylabels_model, data_model,
1110
data=None, changes=None, current_filter=None, bg_gradient=None, bg_value=None):
1211
# set models

larray_editor/arraywidget.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,7 @@ def dropEvent(self, event):
681681

682682
def set_data(self, data, bg_gradient=None, bg_value=None):
683683
self.data_adapter.set_data(data, bg_gradient=bg_gradient, bg_value=bg_value)
684-
self._update()
684+
self._update_digits_scientific(self.data_adapter.get_data())
685685

686686
def set_filters(self):
687687
la_data = self.data_adapter.get_data()
@@ -698,9 +698,13 @@ def set_filters(self):
698698
filters_layout.addStretch()
699699
self.data_adapter.update_filtered_data({})
700700

701-
def _update(self):
701+
def _update_digits_scientific(self, data):
702+
"""
703+
data : LArray
704+
"""
702705
# TODO: Adapter must provide a method to return a data sample as a Numpy array
703-
data = self.data_adapter.get_data().data
706+
assert isinstance(data, la.LArray)
707+
data = data.data
704708
size, dtype = data.size, data.dtype
705709
# this will yield a data sample of max 199
706710
step = (size // 100) if size > 100 else 1
@@ -835,7 +839,7 @@ def dirty(self):
835839
def accept_changes(self):
836840
"""Accept changes"""
837841
la_data = self.data_adapter.accept_changes()
838-
self._update(la_data)
842+
self._update_digits_scientific(la_data)
839843

840844
def reject_changes(self):
841845
"""Reject changes"""
@@ -863,7 +867,7 @@ def digits_changed(self, value):
863867
def create_filter_combo(self, axis):
864868
def filter_changed(checked_items):
865869
filtered = self.data_adapter.change_filter(axis, checked_items)
866-
self._update(filtered)
870+
self._update_digits_scientific(filtered)
867871
combo = FilterComboBox(self)
868872
combo.addItems([str(l) for l in axis.labels])
869873
combo.checkedItemsChanged.connect(filter_changed)

0 commit comments

Comments
 (0)