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

Fix infinite scale in makeARGB (#955)

Browse Source
This commit is contained in:
Kenneth Lyons 2019-06-23 09:38:48 -07:00 committed by Ogi Moore
parent 9500f4db01
commit 9653254094
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

@ -1094,7 +1094,7 @@ def makeARGB(data, lut=None, levels=None, scale=None, useRGBA=False):
for i in range(data.shape[-1]): for i in range(data.shape[-1]):
minVal, maxVal = levels[i] minVal, maxVal = levels[i]
if minVal == maxVal: if minVal == maxVal:
maxVal += 1e-16 maxVal = np.nextafter(maxVal, 2*maxVal)
rng = maxVal-minVal rng = maxVal-minVal
rng = 1 if rng == 0 else rng rng = 1 if rng == 0 else rng
newData[...,i] = rescaleData(data[...,i], scale / rng, minVal, dtype=dtype) newData[...,i] = rescaleData(data[...,i], scale / rng, minVal, dtype=dtype)
@ -1104,7 +1104,7 @@ def makeARGB(data, lut=None, levels=None, scale=None, useRGBA=False):
minVal, maxVal = levels minVal, maxVal = levels
if minVal != 0 or maxVal != scale: if minVal != 0 or maxVal != scale:
if minVal == maxVal: if minVal == maxVal:
maxVal += 1e-16 maxVal = np.nextafter(maxVal, 2*maxVal)
data = rescaleData(data, scale/(maxVal-minVal), minVal, dtype=dtype) data = rescaleData(data, scale/(maxVal-minVal), minVal, dtype=dtype)