fix #71 : filtering up to the point to get a scalar does no longer fail

alixdamman · alixdamman · commit b07663b49266 · 2017-09-25T09:55:37.000+02:00
diff --git a/larray_editor/arrayadapter.py b/larray_editor/arrayadapter.py
@@ -35,15 +35,19 @@ def get_axes_names(self):
         return self.filtered_data.axes.display_names
 
     def get_axes(self):
-        axes_names = self.filtered_data.axes.display_names
-        if len(axes_names) >= 2:
-            axes_names = axes_names[:-2] + [axes_names[-2] + '\\' + axes_names[-1]]
-        return [[axis_name] for axis_name in axes_names]
+        axes = self.filtered_data.axes
+        if len(axes) == 0:
+            return None
+        else:
+            axes_names = axes.display_names
+            if len(axes_names) >= 2:
+                axes_names = axes_names[:-2] + [axes_names[-2] + '\\' + axes_names[-1]]
+            return [[axis_name] for axis_name in axes_names]
 
     def get_xlabels(self):
         axes = self.filtered_data.axes
         if len(axes) == 0:
-            return [[]]
+            return None
         elif len(axes.labels[-1]) == 0:
             return [['']]
         else:
@@ -52,7 +56,7 @@ def get_xlabels(self):
     def get_ylabels(self):
         axes = self.filtered_data.axes
         if len(axes) == 0:
-            return [[]]
+            return None
         elif len(axes) == 1:
             return [['']]
         else:
@@ -113,14 +117,9 @@ def update_filtered_data(self, current_filter=None):
         self.filtered_data = self.la_data[self.current_filter]
         if np.isscalar(self.filtered_data):
             self.filtered_data = la.aslarray(self.filtered_data)
-        if len(self.filtered_data) == 0:
-            axes = [[]]
-            xlabels = [[]]
-            ylabels = [[]]
-        else:
-            axes = self.get_axes()
-            xlabels = self.get_xlabels()
-            ylabels = self.get_ylabels()
+        axes = self.get_axes()
+        xlabels = self.get_xlabels()
+        ylabels = self.get_ylabels()
         data_2D = self.get_2D_data()
         changes_2D = self.get_changes_2D()
         bg_value_2D = self.get_bg_value_2D(data_2D.shape)
diff --git a/larray_editor/arraymodel.py b/larray_editor/arraymodel.py
@@ -139,7 +139,7 @@ def _set_data(self, data, changes=None):
             data = [[]]
         self._data = data
         self.total_rows = len(data[0])
-        self.total_cols = len(data)
+        self.total_cols = len(data) if self.total_rows > 0 else 0
         self._compute_rows_cols_loaded()
 
     def flags(self, index):
