From e46be6ddecb328a5c75563b1a5910ef7b7a6c5c6 Mon Sep 17 00:00:00 2001 From: Luke Campagnola Date: Mon, 18 Jul 2016 17:35:33 -0700 Subject: [PATCH] Remove axes from tests; these break CI tests. --- .../graphicsItems/tests/test_ImageItem.py | 40 ++++++++++--------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/pyqtgraph/graphicsItems/tests/test_ImageItem.py b/pyqtgraph/graphicsItems/tests/test_ImageItem.py index c9b7b4fd..d13d703c 100644 --- a/pyqtgraph/graphicsItems/tests/test_ImageItem.py +++ b/pyqtgraph/graphicsItems/tests/test_ImageItem.py @@ -10,8 +10,11 @@ app = pg.mkQApp() def test_ImageItem(): - view = pg.plot() - view.resize(200, 200) + w = pg.GraphicsWindow() + view = pg.ViewBox() + w.setCentralWidget(view) + w.resize(200, 200) + w.show() img = pg.ImageItem(border=0.5) view.addItem(img) @@ -25,37 +28,37 @@ def test_ImageItem(): data[3, :10] = dmax + 13 img.setImage(data) - QtTest.QTest.qWaitForWindowShown(view) + QtTest.QTest.qWaitForWindowShown(w) time.sleep(0.1) app.processEvents() - assertImageApproved(view, 'imageitem/init', 'Init image item. View is auto-scaled, image axis 0 marked by 1 line, axis 1 is marked by 2 lines. Origin in bottom-left.') + assertImageApproved(w, 'imageitem/init', 'Init image item. View is auto-scaled, image axis 0 marked by 1 line, axis 1 is marked by 2 lines. Origin in bottom-left.') # ..with colormap cmap = pg.ColorMap([0, 0.25, 0.75, 1], [[0, 0, 0, 255], [255, 0, 0, 255], [255, 255, 0, 255], [255, 255, 255, 255]]) img.setLookupTable(cmap.getLookupTable()) - assertImageApproved(view, 'imageitem/lut', 'Set image LUT.') + assertImageApproved(w, 'imageitem/lut', 'Set image LUT.') # ..and different levels img.setLevels([dmax+9, dmax+13]) - assertImageApproved(view, 'imageitem/levels1', 'Levels show only axis lines.') + assertImageApproved(w, 'imageitem/levels1', 'Levels show only axis lines.') img.setLookupTable(None) # test mono int data = np.fromfunction(lambda x,y: x+y*10, (129, 128)).astype(np.int16) img.setImage(data) - assertImageApproved(view, 'imageitem/gradient_mono_int', 'Mono int gradient.') + assertImageApproved(w, 'imageitem/gradient_mono_int', 'Mono int gradient.') img.setLevels([640, 641]) - assertImageApproved(view, 'imageitem/gradient_mono_int_levels', 'Mono int gradient w/ levels to isolate diagonal.') + assertImageApproved(w, 'imageitem/gradient_mono_int_levels', 'Mono int gradient w/ levels to isolate diagonal.') # test mono byte data = np.fromfunction(lambda x,y: x+y, (129, 128)).astype(np.ubyte) img.setImage(data) - assertImageApproved(view, 'imageitem/gradient_mono_byte', 'Mono byte gradient.') + assertImageApproved(w, 'imageitem/gradient_mono_byte', 'Mono byte gradient.') img.setLevels([127, 128]) - assertImageApproved(view, 'imageitem/gradient_mono_byte_levels', 'Mono byte gradient w/ levels to isolate diagonal.') + assertImageApproved(w, 'imageitem/gradient_mono_byte_levels', 'Mono byte gradient w/ levels to isolate diagonal.') # test RGBA byte data = np.zeros((100, 100, 4), dtype='ubyte') @@ -63,15 +66,15 @@ def test_ImageItem(): data[..., 1] = np.linspace(0, 255, 100).reshape(1, 100) data[..., 3] = 255 img.setImage(data) - assertImageApproved(view, 'imageitem/gradient_rgba_byte', 'RGBA byte gradient.') + assertImageApproved(w, 'imageitem/gradient_rgba_byte', 'RGBA byte gradient.') img.setLevels([[128, 129], [128, 255], [0, 1], [0, 255]]) - assertImageApproved(view, 'imageitem/gradient_rgba_byte_levels', 'RGBA byte gradient. Levels set to show x=128 and y>128.') + assertImageApproved(w, 'imageitem/gradient_rgba_byte_levels', 'RGBA byte gradient. Levels set to show x=128 and y>128.') # test RGBA float data = data.astype(float) img.setImage(data / 1e9) - assertImageApproved(view, 'imageitem/gradient_rgba_float', 'RGBA float gradient.') + assertImageApproved(w, 'imageitem/gradient_rgba_float', 'RGBA float gradient.') # checkerboard to test alpha img2 = pg.ImageItem() @@ -84,11 +87,11 @@ def test_ImageItem(): data[..., 1] *= 1e9 data[..., 3] = np.fromfunction(lambda x,y: np.sin(0.1 * (x+y)), (100, 100)) img.setImage(data, levels=[[0, 128e-9],[0, 128e9],[0, 1],[-1, 1]]) - assertImageApproved(view, 'imageitem/gradient_rgba_float_alpha', 'RGBA float gradient with alpha.') + assertImageApproved(w, 'imageitem/gradient_rgba_float_alpha', 'RGBA float gradient with alpha.') # test composition mode img.setCompositionMode(QtGui.QPainter.CompositionMode_Plus) - assertImageApproved(view, 'imageitem/gradient_rgba_float_additive', 'RGBA float gradient with alpha and additive composition mode.') + assertImageApproved(w, 'imageitem/gradient_rgba_float_additive', 'RGBA float gradient with alpha and additive composition mode.') img2.hide() img.setCompositionMode(QtGui.QPainter.CompositionMode_SourceOver) @@ -96,13 +99,14 @@ def test_ImageItem(): # test downsampling data = np.fromfunction(lambda x,y: np.cos(0.002 * x**2), (800, 100)) img.setImage(data, levels=[-1, 1]) - assertImageApproved(view, 'imageitem/resolution_without_downsampling', 'Resolution test without downsampling.') + assertImageApproved(w, 'imageitem/resolution_without_downsampling', 'Resolution test without downsampling.') img.setAutoDownsample(True) - assertImageApproved(view, 'imageitem/resolution_with_downsampling_x', 'Resolution test with downsampling axross x axis.') + assertImageApproved(w, 'imageitem/resolution_with_downsampling_x', 'Resolution test with downsampling axross x axis.') img.setImage(data.T, levels=[-1, 1]) - assertImageApproved(view, 'imageitem/resolution_with_downsampling_y', 'Resolution test with downsampling across y axis.') + assertImageApproved(w, 'imageitem/resolution_with_downsampling_y', 'Resolution test with downsampling across y axis.') + @pytest.mark.skipif(pg.Qt.USE_PYSIDE, reason="pyside does not have qWait") def test_dividebyzero():