fix #84 : display correctly 0 and 1-size arrays

Author: alixdamman

larray_editor/arrayadapter.py

@@ -36,7 +36,9 @@ def get_axes_names(self):
 
     def get_axes(self):
         axes = self.filtered_data.axes
-        if len(axes) == 0:
+        # test self.filtered_data.size == 0 is required in case an instance built as LArray([]) is passed
+        # test len(axes) == 0 is required when a user filters until to get a scalar
+        if self.filtered_data.size == 0 or len(axes) == 0:
             return None
         else:
             axes_names = axes.display_names
@@ -46,16 +48,14 @@ def get_axes(self):
 
     def get_xlabels(self):
         axes = self.filtered_data.axes
-        if len(axes) == 0:
+        if self.filtered_data.size == 0 or len(axes) == 0:
             return None
-        elif len(axes.labels[-1]) == 0:
-            return [['']]
         else:
             return [[label] for label in axes.labels[-1]]
 
     def get_ylabels(self):
         axes = self.filtered_data.axes
-        if len(axes) == 0:
+        if self.filtered_data.size == 0 or len(axes) == 0:
             return None
         elif len(axes) == 1:
             return [['']]

larray_editor/arraywidget.py

@@ -506,7 +506,7 @@ def __init__(self, parent, data_scrollbar):
 
 
 class ArrayEditorWidget(QWidget):
-    def __init__(self, parent, data, readonly=False, bg_value=None, bg_gradient=None, minvalue=None, maxvalue=None):
+    def __init__(self, parent, data=None, readonly=False, bg_value=None, bg_gradient=None, minvalue=None, maxvalue=None):
         QWidget.__init__(self, parent)
         readonly = np.isscalar(data)
         self.readonly = readonly
@@ -700,15 +700,17 @@ def dropEvent(self, event):
         else:
             event.ignore()
 
-    def set_data(self, data, bg_gradient=None, bg_value=None):
+    def set_data(self, data=None, bg_gradient=None, bg_value=None):
+        # update adapter
         self.data_adapter.set_data(data, bg_gradient=bg_gradient, bg_value=bg_value)
-        self._update_digits_scientific(self.data_adapter.get_data())
-
-        # update filters
         la_data = self.data_adapter.get_data()
         axes = la_data.axes
         display_names = axes.display_names
 
+        # update data format and bgcolor
+        self._update_digits_scientific(la_data)
+
+        # update filters
         filters_layout = self.filters_layout
         clear_layout(filters_layout)
         if len(la_data) > 0:

larray_editor/editor.py

@@ -533,7 +533,7 @@ def _ask_to_save_if_unsaved_modifications(self):
     def new(self):
         if self._ask_to_save_if_unsaved_modifications():
             self._reset()
-            self.arraywidget.set_data(np.empty(0))
+            self.arraywidget.set_data()
             self.set_current_file(None)
             self.unsaved_modifications = False
             self.statusBar().showMessage("Viewer has been reset", 4000)