Skip to content

[FIX] Fix AbstractSortTableModel.mapFromSourceRows for empty list or array #2730

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
kernc merged 1 commit into from
Nov 3, 2017
Merged

[FIX] Fix AbstractSortTableModel.mapFromSourceRows for empty list or array #2730

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
14 changes: 10 additions & 4 deletions Orange/widgets/utils/itemmodels.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ def mapToSourceRows(self, rows):

Parameters
----------
rows : int or list of int or numpy.ndarray or Ellipsis
rows : int or list of int or numpy.ndarray of dtype=int or Ellipsis
View (sorted) rows.

Returns
Expand All @@ -127,7 +127,10 @@ def mapToSourceRows(self, rows):
Source rows matching input rows. If they are the same,
simply input `rows` is returned.
"""
if self.__sortInd is not None:
# self.__sortInd[rows] fails if `rows` is an empty list or array
if self.__sortInd is not None \
and (isinstance(rows, (Integral, type(Ellipsis)))
or len(rows)):
new_rows = self.__sortInd[rows]
if rows is Ellipsis:
new_rows.setflags(write=False)
Expand All @@ -139,7 +142,7 @@ def mapFromSourceRows(self, rows):

Parameters
----------
rows : int or list of int or numpy.ndarray or Ellipsis
rows : int or list of int or numpy.ndarray of dtype=int or Ellipsis
Source model rows.

Returns
Expand All @@ -148,7 +151,10 @@ def mapFromSourceRows(self, rows):
ModelIndex (sorted) rows matching input source rows.
If they are the same, simply input `rows` is returned.
"""
if self.__sortIndInv is not None:
# self.__sortInd[rows] fails if `rows` is an empty list or array
if self.__sortIndInv is not None \
and (isinstance(rows, (Integral, type(Ellipsis)))
or len(rows)):
new_rows = self.__sortIndInv[rows]
if rows is Ellipsis:
new_rows.setflags(write=False)
Expand Down
36 changes: 26 additions & 10 deletions Orange/widgets/utils/tests/test_itemmodels.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

from unittest import TestCase

import numpy as np

from AnyQt.QtCore import Qt

from Orange.data import Domain, ContinuousVariable, DiscreteVariable
Expand Down Expand Up @@ -121,17 +123,31 @@ def test_other_roles(self):


class TestAbstractSortTableModel(TestCase):
def setUp(self):
assert issubclass(PyTableModel, AbstractSortTableModel)
self.model = PyTableModel([[1, 4],
[2, 3]])

def test_sorting(self):
self.model.sort(1, Qt.AscendingOrder)
self.assertSequenceEqual(self.model.mapToSourceRows(...).tolist(), [1, 0])

self.model.sort(1, Qt.DescendingOrder)
self.assertSequenceEqual(self.model.mapToSourceRows(...).tolist(), [0, 1])
assert issubclass(PyTableModel, AbstractSortTableModel)
model = PyTableModel([[1, 4],
[2, 2],
[3, 3]])
model.sort(1, Qt.AscendingOrder)
# mapToSourceRows
self.assertSequenceEqual(model.mapToSourceRows(...).tolist(), [1, 2, 0])
self.assertEqual(model.mapToSourceRows(1).tolist(), 2)
self.assertSequenceEqual(model.mapToSourceRows([1, 2]).tolist(), [2, 0])
self.assertSequenceEqual(model.mapToSourceRows([]), [])
self.assertSequenceEqual(model.mapToSourceRows(np.array([], dtype=int)).tolist(), [])
self.assertRaises(IndexError, model.mapToSourceRows, np.r_[0.])

# mapFromSourceRows
self.assertSequenceEqual(model.mapFromSourceRows(...).tolist(), [2, 0, 1])
self.assertEqual(model.mapFromSourceRows(1).tolist(), 0)
self.assertSequenceEqual(model.mapFromSourceRows([1, 2]).tolist(), [0, 1])
self.assertSequenceEqual(model.mapFromSourceRows([]), [])
self.assertSequenceEqual(model.mapFromSourceRows(np.array([], dtype=int)).tolist(), [])
self.assertRaises(IndexError, model.mapFromSourceRows, np.r_[0.])

model.sort(1, Qt.DescendingOrder)
self.assertSequenceEqual(model.mapToSourceRows(...).tolist(), [0, 2, 1])
self.assertSequenceEqual(model.mapFromSourceRows(...).tolist(), [0, 2, 1])


class TestPyListModel(TestCase):
Expand Down