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

Merge remote-tracking branch 'anntzer/integer-image-histogram-range' into integer-image-histogram-range

Browse Source
This commit is contained in:
Luke Campagnola 2014-01-14 21:06:48 -05:00
commit 12149b1dc4
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pyqtgraph/graphicsItems/ImageItem.py
View File

@ -1,3 +1,5 @@
from __future__ import division
from ..Qt import QtGui, QtCore from ..Qt import QtGui, QtCore
import numpy as np import numpy as np
import collections import collections
@ -295,7 +297,15 @@ class ImageItem(GraphicsObject):
if self.image is None: if self.image is None:
return None,None return None,None
stepData = self.image[::step, ::step] stepData = self.image[::step, ::step]
hist = np.histogram(stepData, bins=bins) if not np.iterable(bins):
mn = stepData.min()
mx = stepData.max()
if stepData.dtype.kind in "ui": # unsigned or signed int
# we want max - min to be a multiple of nbins
range = mn, mn + np.ceil((mx - mn) / bins) * bins
else:
range = mn, mx
hist = np.histogram(stepData, bins=bins, range=range)
return hist[1][:-1], hist[0] return hist[1][:-1], hist[0]
def setPxMode(self, b): def setPxMode(self, b):