Skip to content

[FIX] Table: Keep pending selection if data is None #4281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
markotoplak merged 1 commit into from
Dec 20, 2019
Merged

[FIX] Table: Keep pending selection if data is None #4281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions Orange/widgets/data/owtable.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,20 +519,17 @@ def update(_):
if current is not None:
# pylint: disable=protected-access
self.set_info(current._input_slot.summary)
else:
self.__pending_selected_rows = None
self.__pending_selected_cols = None

self.tabs.tabBar().setVisible(self.tabs.count() > 1)
self.openContext(data)

if self.__pending_selected_rows is not None:
if data and self.__pending_selected_rows is not None:
self.selected_rows = self.__pending_selected_rows
self.__pending_selected_rows = None
else:
self.selected_rows = []

if self.__pending_selected_cols is not None:
if data and self.__pending_selected_cols is not None:
self.selected_cols = self.__pending_selected_cols
self.__pending_selected_cols = None
else:
Expand Down
9 changes: 9 additions & 0 deletions Orange/widgets/data/tests/test_owtable.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,15 @@ def test_unconditional_commit_on_new_signal(self):
self.send_signal(self.widget.Inputs.data, self.data)
commit.assert_called()

def test_pending_selection(self):
widget = self.create_widget(OWDataTable, stored_settings=dict(
selected_rows=[5, 6, 7, 8, 9],
selected_cols=list(range(len(self.data.domain)))))
self.send_signal(widget.Inputs.data, None, 1)
self.send_signal(widget.Inputs.data, self.data, 1)
output = self.get_output(widget.Outputs.selected_data)
self.assertEqual(5, len(output))


if __name__ == "__main__":
unittest.main()