Time Series: Properly store and restore selection

Author: janezd

orangecontrib/timeseries/widgets/owdifference.py

@@ -48,16 +48,17 @@ class Outputs:
     want_main_area = False
     resizing_enabled = False
 
+    settings_version = 2
     operation = settings.Setting(Diff)
     shift_period = settings.Setting(1)
     invert_direction = settings.Setting(False)
     assume_zero_before = settings.Setting(False)
-    selection: List[str] = settings.Setting([])
+    pending_selection: List[str] = settings.Setting([])
     autocommit = settings.Setting(True)
 
     def __init__(self):
         self.data = None
-        self.selection = self.persistent_selection = []
+        self.selection = []
 
         self.view = view = QListView(self,
                                      selectionMode=QListView.ExtendedSelection)
@@ -104,31 +105,30 @@ def _update_gui_state(self):
             and self.operation in (self.Diff, self.Diff2))
 
     def _selection_changed(self):
-        self.selection = [
+        self.pending_selection = self.selection = [
             self.model.data(index)
             for index in self.view.selectionModel().selectedRows()]
         self.commit.deferred()
 
     @Inputs.time_series
     def set_data(self, data):
-        if self.selection:
-            self.persistent_selection = self.selection[:]
-
         if not data:
             self.data = None
-            self.model.clear()
+            with signal_blocking(self.view.selectionModel()):
+                self.model.clear()
+            self.selection = []
             self.commit.now()
             return
 
         self.data = Timeseries.from_data_table(data)
-        self.model[:] = [var for var in data.domain.variables
-                         if var.is_continuous and var is not
-                         self.data.time_variable]
-
-        names = [attr.name for attr in self.model]
-        self.selection = [name for name in self.persistent_selection
-                          if name in names]
         with signal_blocking(self.view.selectionModel()):
+            self.model[:] = [var for var in data.domain.variables
+                             if var.is_continuous and var is not
+                             self.data.time_variable]
+
+            names = [attr.name for attr in self.model]
+            self.pending_selection = self.selection = [
+                name for name in self.pending_selection if name in names]
             select_rows(self.view,
                         [names.index(name) for name in self.selection])
         self.commit.now()
@@ -200,6 +200,11 @@ def compute(self, data, attr_names):
             columns = np.zeros((len(data), 0), dtype=float)
         return tuple(attrs), columns
 
+    @classmethod
+    def migrate_settings(cls, settings, version):
+        if version < 2:
+            settings["pending_selection"] = settings.pop("selection", [])
+        return super().migrate_settings(settings, version)
 
 if __name__ == "__main__":
     WidgetPreview(OWDifference).run(set_data=Table.from_file('iris'))

orangecontrib/timeseries/widgets/tests/test_owdifference.py

@@ -47,6 +47,25 @@ def test_saved_selection(self):
         self.send_signal(self.widget.Inputs.time_series, self.data[:, 2:])
         self.assertEqual(widget.selection, ["c"])
 
+    def test_selection_from_saved_workflow(self):
+        settings = {
+            'autocommit': True, 'controlAreaVisible': True,
+            'invert_direction': False, 'operation': 0, 'shift_period': 1,
+            'pending_selection': ['b', 'c'],
+            '__version__': 2}
+        widget = self.create_widget(OWDifference, stored_settings=settings)
+        self.send_signal(widget.Inputs.time_series, self.data)
+        self.assertEqual(widget.selection, ["b", "c"])
+
+    def test_migration_to_2(self):
+        settings = {
+            'autocommit': True, 'controlAreaVisible': True,
+            'invert_direction': False, 'operation': 0, 'shift_period': 1,
+            'selection': ['b', 'c']}
+        widget = self.create_widget(OWDifference, stored_settings=settings)
+        self.send_signal(widget.Inputs.time_series, self.data)
+        self.assertEqual(widget.selection, ["b", "c"])
+
     def test_difference(self):
         widget = self.widget
         widget.operation = widget.Diff
@@ -362,7 +381,7 @@ def sq(r, c, add):
             return np.arange(add, add + r * c, dtype=float).reshape(r, c)
 
         widget = self.widget
-        widget.selection = list("abc")
+        widget.pending_selection = list("abc")
         widget.shift_period = 1
         widget.operation = 2