From 9893fc37353a8f1b02637fb4835a9196df52945b Mon Sep 17 00:00:00 2001 From: Luke Campagnola Date: Fri, 26 Sep 2014 15:25:05 -0400 Subject: [PATCH] corrections for 1d arrays --- pyqtgraph/widgets/DiffTreeWidget.py | 13 +++++++------ pyqtgraph/widgets/TableWidget.py | 5 +++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pyqtgraph/widgets/DiffTreeWidget.py b/pyqtgraph/widgets/DiffTreeWidget.py index e3869da8..eac29489 100644 --- a/pyqtgraph/widgets/DiffTreeWidget.py +++ b/pyqtgraph/widgets/DiffTreeWidget.py @@ -91,12 +91,13 @@ class DiffTreeWidget(QtGui.QWidget): #for i in np.argwhere(~eq): else: - for i,k in enumerate(info.dtype.fields.keys()): - eq = self.compareArrays(a[k], b[k]) - if not np.all(eq): - for n in tableNodes: - n.setBackground(0, fn.mkBrush(bad)) - #for j in np.argwhere(~eq): + if a.dtype == b.dtype: + for i,k in enumerate(a.dtype.fields.keys()): + eq = self.compareArrays(a[k], b[k]) + if not np.all(eq): + for n in tableNodes: + n.setBackground(0, fn.mkBrush(bad)) + #for j in np.argwhere(~eq): # dict: compare keys, then values where keys match # list: diff --git a/pyqtgraph/widgets/TableWidget.py b/pyqtgraph/widgets/TableWidget.py index db0b6ae2..9e9f2144 100644 --- a/pyqtgraph/widgets/TableWidget.py +++ b/pyqtgraph/widgets/TableWidget.py @@ -222,6 +222,8 @@ class TableWidget(QtGui.QTableWidget): return self.iterate, list(map(asUnicode, data.dtype.names)) elif data is None: return (None,None) + elif np.isscalar(data): + return self.iterateScalar, None else: msg = "Don't know how to iterate over data type: {!s}".format(type(data)) raise TypeError(msg) @@ -236,6 +238,9 @@ class TableWidget(QtGui.QTableWidget): for x in data: yield x + def iterateScalar(self, data): + yield data + def appendRow(self, data): self.appendData([data])