Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 7 additions & 3 deletions Orange/widgets/utils/colorpalettes.py
Original file line number Diff line number Diff line change
Expand Up @@ -176,11 +176,15 @@ def __init__(self, number_of_colors, nan_color=NAN_COLOR,
"use 'force_glasbey' instead", DeprecationWarning)
if force_glasbey or force_hsv \
or number_of_colors > len(DefaultRGBColors):
palette = Glasbey
colors = Glasbey.palette[:number_of_colors]
if number_of_colors > len(colors):
colors = np.vstack(
(colors, ) * (number_of_colors // len(colors))
+ (colors[:number_of_colors % len(colors)], ))
else:
palette = DefaultRGBColors
colors = DefaultRGBColors.palette[:number_of_colors]
super().__init__("custom", "custom",
palette.palette[:number_of_colors], nan_color,
colors, nan_color,
category=category, flags=flags)


Expand Down
25 changes: 25 additions & 0 deletions Orange/widgets/utils/tests/test_colorpalettes.py
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,27 @@ def test_small_palettes():
palette = LimitedDiscretePalette(100)
np.testing.assert_equal(palette.palette, Glasbey.palette[:100])

def test_large_palettes(self):
palette = LimitedDiscretePalette(257)
qcolors = palette.qcolors
qcolors_w_nan = palette.qcolors_w_nan
c256 = qcolors[256].getRgb()

self.assertEqual(len(palette), 257)
self.assertEqual(len(palette.palette), 257)
self.assertEqual(len(qcolors), 257)
self.assertEqual(len(qcolors_w_nan), 258)
self.assertEqual([c.getRgb() for c in qcolors],
[c.getRgb() for c in qcolors_w_nan[:-1]])
self.assertEqual(palette[256].getRgb(), c256)
np.testing.assert_equal(palette.value_to_color(256), c256[:3])
self.assertEqual(palette.value_to_qcolor(256).getRgb(), c256)
np.testing.assert_equal(palette.values_to_colors([256])[0], c256[:3])
self.assertEqual(palette.values_to_qcolors([256])[0].getRgb(), c256)

for size in range(1020, 1030):
self.assertEqual(len(LimitedDiscretePalette(size)), size)

@staticmethod
def test_forced_glasbey_palettes():
palette = LimitedDiscretePalette(5, force_glasbey=True)
Expand Down Expand Up @@ -598,6 +619,10 @@ def test_colors(self):
np.testing.assert_almost_equal(var.colors,
[palette[1], [13, 14, 15], palette[0]])

# Variable with many values
var = DiscreteVariable("x", values=tuple(f"v{i}" for i in range(1020)))
self.assertEqual(len(var.colors), 1020)

def test_colors_fallback_to_palette(self):
var = DiscreteVariable.make("a", values=("F", "M"))
var.palette = Dark2Colors
Expand Down