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

Fix most errors...

Browse Source
This commit is contained in:
Ogi Moore 2021-02-12 17:23:54 -08:00
parent 3bfe2d81ba
commit dce2288a18
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pyqtgraph/functions.py
View File

@ -262,7 +262,7 @@ def mkColor(*args):
a = int(c[6:8], 16) a = int(c[6:8], 16)
elif isinstance(args[0], QtGui.QColor): elif isinstance(args[0], QtGui.QColor):
return QtGui.QColor(args[0]) return QtGui.QColor(args[0])
elif isinstance(args[0], float): elif np.issubdtype(type(args[0]), np.floating):
r = g = b = int(args[0] * 255) r = g = b = int(args[0] * 255)
a = 255 a = 255
elif hasattr(args[0], '__len__'): elif hasattr(args[0], '__len__'):
@ -275,7 +275,7 @@ def mkColor(*args):
return intColor(*args[0]) return intColor(*args[0])
else: else:
raise TypeError(err) raise TypeError(err)
elif type(args[0]) == int: elif np.issubdtype(type(args[0]), np.integer):
return intColor(args[0]) return intColor(args[0])
else: else:
raise TypeError(err) raise TypeError(err)