fixed issues #55 and #56

fixed filters and title not being updated when displaying array created via the console (closes #55).
fixed array grid not being updated when selecting a variable when no variable was selected (closes #56)

Author: gdementen

larray_editor/arraywidget.py

@@ -602,7 +602,6 @@ def __init__(self, parent, data, readonly=False, bg_value=None, bg_gradient=None
         layout.setContentsMargins(0, 0, 0, 0)
         self.setLayout(layout)
         self.set_data(data, bg_value=bg_value, bg_gradient=bg_gradient)
-        self.set_filters()
 
         # See http://doc.qt.io/qt-4.8/qt-draganddrop-fridgemagnets-dragwidget-cpp.html for an example
         self.setAcceptDrops(True)
@@ -670,7 +669,6 @@ def dropEvent(self, event):
                 new_axes.insert(new_index, new_axes.pop(new_axes[previous_index]))
                 la_data = la_data.transpose(new_axes)
                 self.set_data(la_data, self.model_data.bg_gradient, self.model_data.bg_value)
-                self.set_filters()
 
                 event.setDropAction(Qt.MoveAction)
                 event.accept()
@@ -683,7 +681,7 @@ def set_data(self, data, bg_gradient=None, bg_value=None):
         self.data_adapter.set_data(data, bg_gradient=bg_gradient, bg_value=bg_value)
         self._update_digits_scientific(self.data_adapter.get_data())
 
-    def set_filters(self):
+        # update filters
         la_data = self.data_adapter.get_data()
         axes = la_data.axes
         display_names = axes.display_names

larray_editor/editor.py

@@ -109,6 +109,9 @@ def setup_and_check(self, data, title='', readonly=False, minvalue=None, maxvalu
 
         self._listwidget = QListWidget(self)
         self._listwidget.currentItemChanged.connect(self.on_item_changed)
+        # this is a workaround for the fact that no currentItemChanged signal is emitted when no item was selected
+        # before
+        self._listwidget.itemSelectionChanged.connect(self.on_selection_changed)
         self._listwidget.setMinimumWidth(45)
 
         del_item_shortcut = QShortcut(QKeySequence(Qt.Key_Delete), self._listwidget)
@@ -417,6 +420,14 @@ def ipython_cell_executed(self):
                     if isinstance(cur_output, matplotlib.axes.Subplot) and 'inline' not in matplotlib.get_backend():
                         show_figure(self, cur_output.figure)
 
+    def on_selection_changed(self, *args, **kwargs):
+        selected = self._listwidget.selectedItems()
+        if selected:
+            assert len(selected) == 1
+            selected_item = selected[0]
+            assert isinstance(selected_item, QListWidgetItem)
+            self.on_item_changed(selected_item, None)
+
     def on_item_changed(self, curr, prev):
         if curr is not None:
             name = str(curr.text())
@@ -457,12 +468,11 @@ def update_title(self):
         self.setWindowTitle(' - '.join(title))
 
     def set_current_array(self, array, name):
-        self.current_array = array
-        self.arraywidget.set_data(array)
-        if name != '<expr>' and name != self.current_array_name:
-            self.arraywidget.set_filters()
+        if array is not self.current_array:
+            self.current_array = array
+            self.arraywidget.set_data(array)
             self.current_array_name = name
-        self.update_title()
+            self.update_title()
 
     def _add_arrays(self, arrays):
         for k, v in arrays.items():
@@ -501,7 +511,6 @@ def new(self):
         if self._ask_to_save_if_unsaved_modifications():
             self._reset()
             self.arraywidget.set_data(np.empty(0))
-            self.arraywidget.set_filters()
             self.set_current_file(None)
             self._unsaved_modifications = False
             self.statusBar().showMessage("Viewer has been reset", 4000)