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

avoid numpy warnings when indexing with floats

Browse Source
This commit is contained in:
Luke Campagnola 2016-01-30 12:20:05 -08:00
parent 3f03622a02
commit d308d45153
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pyqtgraph/graphicsItems/ScatterPlotItem.py
View File

@ -145,7 +145,7 @@ class SymbolAtlas(object):
arr = fn.imageToArray(img, copy=False, transpose=False) arr = fn.imageToArray(img, copy=False, transpose=False)
else: else:
(y,x,h,w) = sourceRect.getRect() (y,x,h,w) = sourceRect.getRect()
arr = self.atlasData[x:x+w, y:y+w] arr = self.atlasData[int(x):int(x+w), int(y):int(y+w)]
rendered[key] = arr rendered[key] = arr
w = arr.shape[0] w = arr.shape[0]
avgWidth += w avgWidth += w
@ -180,10 +180,10 @@ class SymbolAtlas(object):
self.atlasRows[-1][2] = x self.atlasRows[-1][2] = x
height = y + rowheight height = y + rowheight
self.atlasData = np.zeros((width, height, 4), dtype=np.ubyte) self.atlasData = np.zeros((int(width), int(height), 4), dtype=np.ubyte)
for key in symbols: for key in symbols:
y, x, h, w = self.symbolMap[key].getRect() y, x, h, w = self.symbolMap[key].getRect()
self.atlasData[x:x+w, y:y+h] = rendered[key] self.atlasData[int(x):int(x+w), int(y):int(y+h)] = rendered[key]
self.atlas = None self.atlas = None
self.atlasValid = True self.atlasValid = True
self.max_width = maxWidth self.max_width = maxWidth