ASCEE/pyqtgraph
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix overflow warning in QColor by using np.isfinite

Browse Source
This commit is contained in:
Ogi Moore 2021-04-21 00:28:19 -07:00
parent 3ea92736b8
commit 6a386e723b
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pyqtgraph/functions.py
View File

@ -266,6 +266,8 @@ def mkColor(*args):
g = int(c[2:4], 16) g = int(c[2:4], 16)
b = int(c[4:6], 16) b = int(c[4:6], 16)
a = int(c[6:8], 16) a = int(c[6:8], 16)
else:
raise ValueError(f"Unknown how to convert string {c} to color")
elif isinstance(args[0], QtGui.QColor): elif isinstance(args[0], QtGui.QColor):
return QtGui.QColor(args[0]) return QtGui.QColor(args[0])
elif np.issubdtype(type(args[0]), np.floating): elif np.issubdtype(type(args[0]), np.floating):
@ -273,10 +275,10 @@ def mkColor(*args):
a = 255 a = 255
elif hasattr(args[0], '__len__'): elif hasattr(args[0], '__len__'):
if len(args[0]) == 3: if len(args[0]) == 3:
(r, g, b) = args[0] r, g, b = args[0]
a = 255 a = 255
elif len(args[0]) == 4: elif len(args[0]) == 4:
(r, g, b, a) = args[0] r, g, b, a = args[0]
elif len(args[0]) == 2: elif len(args[0]) == 2:
return intColor(*args[0]) return intColor(*args[0])
else: else:
@ -286,14 +288,13 @@ def mkColor(*args):
else: else:
raise TypeError(err) raise TypeError(err)
elif len(args) == 3: elif len(args) == 3:
(r, g, b) = args r, g, b = args
a = 255 a = 255
elif len(args) == 4: elif len(args) == 4:
(r, g, b, a) = args r, g, b, a = args
else: else:
raise TypeError(err) raise TypeError(err)
args = [int(a) if np.isfinite(a) else 0 for a in (r, g, b, a)]
args = [int(a) if math.isfinite(a) else 0 for a in (r, g, b, a)]
return QtGui.QColor(*args) return QtGui.QColor(*args)