Skip to content

fix calculation of color index #134

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

Closed
MxMartin wants to merge 2 commits into from
Closed

fix calculation of color index #134

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5147eec
fix calculation of color index
MxMartin Jul 30, 2023
b18cea0
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 30, 2023
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: 11 additions & 3 deletions branca/colormap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,9 @@ def rgba_floats_tuple(self, x):
if x >= self.index[-1]:
return self.colors[-1]

i = len([u for u in self.index if u < x]) # 0 < i < n.
# get the index of the first entry in self.index that is larger than x
i = next(i for i, v in enumerate(self.index) if v > x)

if self.index[i - 1] < self.index[i]:
p = (x - self.index[i - 1]) * 1.0 / (self.index[i] - self.index[i - 1])
elif self.index[i - 1] == self.index[i]:
Expand Down Expand Up @@ -496,6 +498,8 @@ def __init__(
if index is None:
self.index = [vmin + (vmax - vmin) * i * 1.0 / n for i in range(n + 1)]
else:
if any(index[i] > index[i + 1] for i in range(len(index) - 1)):
raise ValueError("The value in index must be in ascending order")
self.index = list(index)
self.colors = [_parse_color(x) for x in colors]

Expand All @@ -510,8 +514,12 @@ def rgba_floats_tuple(self, x):
if x >= self.index[-1]:
return self.colors[-1]

i = len([u for u in self.index if u < x]) # 0 < i < n.
return tuple(self.colors[i - 1])
# get the index of the first entry in self.index that is larger than x
# subtract 1 to get the index of the last entry that is less or equal to x
i = next(i for i, v in enumerate(self.index) if v > x) - 1

# return the color at index i
return tuple(self.colors[i])

def to_linear(self, index=None, max_labels=10):
"""
Expand Down