srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

gui/displays: do not test for empty list using bool conversion (breaks for numpy arrays). Closes #153

This commit is contained in:
Sebastien Bourdeauducq 2015-10-22 11:00:11 +08:00
parent 50809e02c2
commit e4165aecf2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artiq/gui/displays.py
View File

@ -137,7 +137,7 @@ class XYDisplay(dockarea.Dock):
error = data.get(result_error, None) error = data.get(result_error, None)
fit = data.get(result_fit, None) fit = data.get(result_fit, None)
if not y or len(y) != len(x): if not len(y) or len(y) != len(x):
return return
if error is not None and hasattr(error, "__len__"): if error is not None and hasattr(error, "__len__"):
if not len(error): if not len(error):
@ -201,7 +201,7 @@ class HistogramDisplay(dockarea.Dock):
if x is None: if x is None:
x = list(range(len(y)+1)) x = list(range(len(y)+1))
if y and len(x) == len(y) + 1: if len(y) and len(x) == len(y) + 1:
self.plot.clear() self.plot.clear()
self.plot.plot(x, y, stepMode=True, fillLevel=0, self.plot.plot(x, y, stepMode=True, fillLevel=0,
brush=(0, 0, 255, 150)) brush=(0, 0, 255, 150))