From dce2288a18c3929bb717ca3c02515dfa5c4254a5 Mon Sep 17 00:00:00 2001 From: Ogi Moore Date: Fri, 12 Feb 2021 17:23:54 -0800 Subject: [PATCH] Fix most errors... --- pyqtgraph/functions.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyqtgraph/functions.py b/pyqtgraph/functions.py index 5bfd76dd..7276f677 100644 --- a/pyqtgraph/functions.py +++ b/pyqtgraph/functions.py @@ -262,7 +262,7 @@ def mkColor(*args): a = int(c[6:8], 16) elif isinstance(args[0], QtGui.QColor): 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) a = 255 elif hasattr(args[0], '__len__'): @@ -275,7 +275,7 @@ def mkColor(*args): return intColor(*args[0]) else: raise TypeError(err) - elif type(args[0]) == int: + elif np.issubdtype(type(args[0]), np.integer): return intColor(args[0]) else: raise TypeError(err)