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

bugfix in polylineroi.getarrayregion

Browse Source
This commit is contained in:
Luke Campagnola 2016-08-27 15:51:54 -07:00
parent df691596a7
commit 67bff6b9ca
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/ROIExamples.py
View File

@ -11,7 +11,7 @@ import pyqtgraph as pg
from pyqtgraph.Qt import QtCore, QtGui from pyqtgraph.Qt import QtCore, QtGui
import numpy as np import numpy as np
pg.setConfigOptions(imageAxisOrder='normal') pg.setConfigOptions(imageAxisOrder='row-major')
## Create image to display ## Create image to display
arr = np.ones((100, 100), dtype=float) arr = np.ones((100, 100), dtype=float)

20
pyqtgraph/graphicsItems/ROI.py
View File

@ -1030,7 +1030,7 @@ class ROI(GraphicsObject):
return None return None
## Modify transform to scale from image coords to data coords ## Modify transform to scale from image coords to data coords
axisOrder = getConfigOption('imageAxisOrder') axisOrder = img.axisOrder
if axisOrder == 'row-major': if axisOrder == 'row-major':
tr.scale(float(dShape[1]) / img.width(), float(dShape[0]) / img.height()) tr.scale(float(dShape[1]) / img.width(), float(dShape[0]) / img.height())
else: else:
@ -1076,8 +1076,7 @@ class ROI(GraphicsObject):
ROI and the boundaries of *data*. ROI and the boundaries of *data*.
axes (length-2 tuple) Specifies the axes in *data* that axes (length-2 tuple) Specifies the axes in *data* that
correspond to the (x, y) axes of *img*. If the correspond to the (x, y) axes of *img*. If the
global configuration variable image's axis order is set to
:ref:`imageAxisOrder <apiref_config>` is set to
'row-major', then the axes are instead specified in 'row-major', then the axes are instead specified in
(y, x) order. (y, x) order.
returnMappedCoords (bool) If True, the array slice is returned along returnMappedCoords (bool) If True, the array slice is returned along
@ -1155,7 +1154,7 @@ class ROI(GraphicsObject):
shape = [abs(shape[0]/sx), abs(shape[1]/sy)] shape = [abs(shape[0]/sx), abs(shape[1]/sy)]
if getConfigOption('imageAxisOrder') == 'row-major': if img.axisOrder == 'row-major':
# transpose output # transpose output
vectors = vectors[::-1] vectors = vectors[::-1]
shape = shape[::-1] shape = shape[::-1]
@ -1182,7 +1181,7 @@ class ROI(GraphicsObject):
p.translate(-bounds.topLeft()) p.translate(-bounds.topLeft())
p.drawPath(shape) p.drawPath(shape)
p.end() p.end()
mask = fn.imageToArray(im)[:,:,0].astype(float) / 255. mask = fn.imageToArray(im, transpose=True)[:,:,0].astype(float) / 255.
return mask return mask
def getGlobalTransform(self, relativeTo=None): def getGlobalTransform(self, relativeTo=None):
@ -1655,7 +1654,7 @@ class MultiRectROI(QtGui.QGraphicsObject):
## make sure orthogonal axis is the same size ## make sure orthogonal axis is the same size
## (sometimes fp errors cause differences) ## (sometimes fp errors cause differences)
if getConfigOption('imageAxisOrder') == 'row-major': if img.axisOrder == 'row-major':
axes = axes[::-1] axes = axes[::-1]
ms = min([r.shape[axes[1]] for r in rgns]) ms = min([r.shape[axes[1]] for r in rgns])
sl = [slice(None)] * rgns[0].ndim sl = [slice(None)] * rgns[0].ndim
@ -2025,7 +2024,14 @@ class PolyLineROI(ROI):
if br.width() > 1000: if br.width() > 1000:
raise Exception() raise Exception()
sliced = ROI.getArrayRegion(self, data, img, axes=axes, fromBoundingRect=True) sliced = ROI.getArrayRegion(self, data, img, axes=axes, fromBoundingRect=True)
mask = self.renderShapeMask(sliced.shape[axes[0]], sliced.shape[axes[1]])
if img.axisOrder == 'col-major':
mask = self.renderShapeMask(sliced.shape[axes[0]], sliced.shape[axes[1]])
else:
mask = self.renderShapeMask(sliced.shape[axes[1]], sliced.shape[axes[0]])
mask = mask.T
# reshape mask to ensure it is applied to the correct data axes
shape = [1] * data.ndim shape = [1] * data.ndim
shape[axes[0]] = sliced.shape[axes[0]] shape[axes[0]] = sliced.shape[axes[0]]
shape[axes[1]] = sliced.shape[axes[1]] shape[axes[1]] = sliced.shape[axes[1]]

5
pyqtgraph/tests/image_testing.py
View File

@ -159,12 +159,15 @@ def assertImageApproved(image, standardFile, message=None, **kwargs):
if bool(os.getenv('PYQTGRAPH_PRINT_TEST_STATE', False)): if bool(os.getenv('PYQTGRAPH_PRINT_TEST_STATE', False)):
print(graphstate) print(graphstate)
if os.getenv('PYQTGRAPH_AUDIT_ALL') == '1':
raise Exception("Image test passed, but auditing due to PYQTGRAPH_AUDIT_ALL evnironment variable.")
except Exception: except Exception:
if stdFileName in gitStatus(dataPath): if stdFileName in gitStatus(dataPath):
print("\n\nWARNING: unit test failed against modified standard " print("\n\nWARNING: unit test failed against modified standard "
"image %s.\nTo revert this file, run `cd %s; git checkout " "image %s.\nTo revert this file, run `cd %s; git checkout "
"%s`\n" % (stdFileName, dataPath, standardFile)) "%s`\n" % (stdFileName, dataPath, standardFile))
if os.getenv('PYQTGRAPH_AUDIT') == '1': if os.getenv('PYQTGRAPH_AUDIT') == '1' or os.getenv('PYQTGRAPH_AUDIT_ALL') == '1':
sys.excepthook(*sys.exc_info()) sys.excepthook(*sys.exc_info())
getTester().test(image, stdImage, message) getTester().test(image, stdImage, message)
stdPath = os.path.dirname(stdFileName) stdPath = os.path.dirname(stdFileName)