Skip to content

Commit

Permalink
Merge branch 'release-3.30.1' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
markotoplak committed Sep 24, 2021
2 parents eaa7571 + 619365d commit 7073993
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 6 deletions.
10 changes: 8 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ Change Log
[next] - TBA
------------

[3.30.1] - 2021-09-24
--------------------
##### Bugfixes
* OWTable: fix select whole rows regression ([#5605](../../pull/5605))

[3.30.0] - 2021-09-22
--------------------
##### Enhancements
Expand Down Expand Up @@ -1589,8 +1594,9 @@ Change Log
* Initial version based on Python 1.5.2 and Qt 2.3


[next]: https://github.com/biolab/orange3/compare/3.30.0...HEAD
[next]: https://github.com/biolab/orange3/compare/3.29.3...3.30.0
[next]: https://github.com/biolab/orange3/compare/3.30.1...HEAD
[3.30.1]: https://github.com/biolab/orange3/compare/3.30.0...3.30.1
[3.30.0]: https://github.com/biolab/orange3/compare/3.29.3...3.30.0
[3.29.3]: https://github.com/biolab/orange3/compare/3.29.2...3.29.3
[3.29.2]: https://github.com/biolab/orange3/compare/3.29.1...3.29.2
[3.29.1]: https://github.com/biolab/orange3/compare/3.29.0...3.29.1
Expand Down
4 changes: 2 additions & 2 deletions Orange/widgets/data/owtable.py
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,7 @@ def _update_variable_labels(self, view):

def _on_show_variable_labels_changed(self):
"""The variable labels (var.attribues) visibility was changed."""
for slot in self._inputs.values():
for slot in self._inputs:
self._update_variable_labels(slot.view)

def _on_distribution_color_changed(self):
Expand All @@ -619,7 +619,7 @@ def _on_distribution_color_changed(self):
tab.reset()

def _on_select_rows_changed(self):
for slot in self._inputs.values():
for slot in self._inputs:
selection_model = slot.view.selectionModel()
selection_model.setSelectBlocks(not self.select_rows)
if self.select_rows:
Expand Down
30 changes: 29 additions & 1 deletion Orange/widgets/data/tests/test_owtable.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def test_reset_select(self):

def _select_data(self):
self.widget.selected_cols = list(range(len(self.data.domain.variables)))
self.widget.selected_rows = list(range(0, len(self.data.domain.variables), 10))
self.widget.selected_rows = list(range(0, len(self.data), 10))
self.widget.set_selection()
return self.widget.selected_rows

Expand Down Expand Up @@ -168,6 +168,34 @@ def test_show_distributions(self):
w.grab()
w.controls.show_distributions.toggle()

def test_whole_rows(self):
w = self.widget
self.send_signal(w.Inputs.data, self.data, 0)
self.assertTrue(w.select_rows) # default value
with excepthook_catch():
w.controls.select_rows.toggle()
self.assertFalse(w.select_rows)
w.selected_cols = [0, 1]
w.selected_rows = [0, 1, 2, 3]
w.set_selection()
out = self.get_output(w.Outputs.selected_data)
self.assertEqual(out.domain,
Domain([self.data.domain.attributes[0]], self.data.domain.class_var))
with excepthook_catch():
w.controls.select_rows.toggle()
out = self.get_output(w.Outputs.selected_data)
self.assertTrue(w.select_rows)
self.assertEqual(out.domain,
self.data.domain)

def test_show_attribute_labels(self):
w = self.widget
self.send_signal(w.Inputs.data, self.data, 0)
self.assertTrue(w.show_attribute_labels) # default value
with excepthook_catch():
w.controls.show_attribute_labels.toggle()
self.assertFalse(w.show_attribute_labels)


if __name__ == "__main__":
unittest.main()
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

NAME = 'Orange3'

VERSION = '3.30.0'
VERSION = '3.30.1'
ISRELEASED = True
# full version identifier including a git revision identifier for development
# build/releases (this is filled/updated in `write_version_py`)
Expand Down

0 comments on commit 7073993

Please sign in to comment.