fix image tests

Author: nschloe

matplotlib2tikz/image.py

@@ -43,9 +43,15 @@ def draw_image(data, obj):
         # RGB (+alpha) information at each point
         assert len(dims) == 3 and dims[2] in [3, 4]
         # convert to PIL image
-        if obj.origin == "lower":
+        if obj.origin == 'lower':
             img_array = numpy.flipud(img_array)
-        image = PIL.Image.fromarray(img_array)
+
+        # Convert mpl image to PIL
+        image = PIL.Image.fromarray(numpy.uint8(img_array*255))
+
+        # If the input image is PIL:
+        # image = PIL.Image.fromarray(img_array)
+
         image.save(filename, origin=obj.origin)
 
     # write the corresponding information to the TikZ file

test/test_annotate.py

@@ -39,7 +39,7 @@ def plot():
 def test():
     plt.close('all')
     phash = Phash(plot())
-    assert phash.phash == 'ab8a71a1549e54be', phash.get_details()
+    assert phash.phash == 'ab8a79a1549654de', phash.get_details()
 
 
 if __name__ == '__main__':

test/test_fancybox.py

@@ -193,7 +193,7 @@ def plot():
 
 def test():
     phash = helpers.Phash(plot())
-    assert phash.phash == 'dd2325dc23cdd81a', phash.get_details()
+    assert phash.phash == 'dd2325d823cdd85a', phash.get_details()
 
 
 if __name__ == '__main__':

test/test_image_plot.py

@@ -1,49 +1,51 @@
 # -*- coding: utf-8 -*-
 #
 import helpers
+
+import matplotlib.pyplot as plt
 import pytest
 
 # the picture 'lena.png' with origin='lower' is flipped upside-down.
 # So it has to be upside-down in the pdf-file as well.
 
 
-# test for monochrome picture
-def plot1():
+def plot_upper():
     from matplotlib import rcParams
-    import matplotlib.pyplot as plt
-    from PIL import Image
+    import matplotlib.image as mpimg
     import os
 
     this_dir = os.path.dirname(os.path.realpath(__file__))
-    lena = Image.open(os.path.join(this_dir, 'lena.png'))
-    lena = lena.convert('L')
+    img = mpimg.imread(os.path.join(this_dir, 'lena.png'))
+
     dpi = rcParams['figure.dpi']
-    figsize = lena.size[0]/dpi, lena.size[1]/dpi
+    figsize = img.shape[0]/dpi, img.shape[1]/dpi
     fig = plt.figure(figsize=figsize)
     ax = plt.axes([0, 0, 1, 1], frameon=False)
     ax.set_axis_off()
-    plt.imshow(lena, cmap='viridis', origin='lower')
+
+    plt.imshow(img, cmap='viridis', origin='upper')
+
     # Set the current color map to HSV.
     plt.hsv()
     plt.colorbar()
     return fig
 
 
-# test for rgb picture
-def plot2():
+def plot_lower():
     from matplotlib import rcParams
-    import matplotlib.pyplot as plt
-    from PIL import Image
+    import matplotlib.image as mpimg
     import os
 
     this_dir = os.path.dirname(os.path.realpath(__file__))
-    lena = Image.open(os.path.join(this_dir, 'lena.png'))
+    img = mpimg.imread(os.path.join(this_dir, 'lena.png'))
+
     dpi = rcParams['figure.dpi']
-    figsize = lena.size[0] / dpi, lena.size[1] / dpi
+    figsize = img.shape[0] / dpi, img.shape[1] / dpi
+
     fig = plt.figure(figsize=figsize)
     ax = plt.axes([0, 0, 1, 1], frameon=False)
     ax.set_axis_off()
-    plt.imshow(lena, cmap='viridis', origin='lower')
+    plt.imshow(img, cmap='viridis', origin='lower')
     # Set the current color map to HSV.
     plt.hsv()
     plt.colorbar()
@@ -52,11 +54,16 @@ def plot2():
 
 @pytest.mark.parametrize(
     'plot, reference_phash', [
-        (plot1, '455361ec211d72fb'),
-        (plot2, '7558d3b30f634b06'),
+        (plot_upper, '75c3d36d1f090ba1'),
+        (plot_lower, '7548d3b34f234b07'),
     ]
     )
 def test(plot, reference_phash):
     phash = helpers.Phash(plot())
     assert phash.phash == reference_phash, phash.get_details()
     return
+
+
+if __name__ == '__main__':
+    plot_upper()
+    plt.show()