fixed bug in test_rotated_labels, fixed test_image_plot, now assert_phash saves output pdf in test directory in case of a failure so you can see wether the picture is flipped or not

Author: danielhkl

matplotlib2tikz/image.py

@@ -27,13 +27,13 @@ def draw_image(data, obj):
     # store the image as in a file
     img_array = obj.get_array()
 
+    if obj.origin == "lower":
+        img_array = numpy.flipud(img_array)
+
     dims = img_array.shape
     if len(dims) == 2:  # the values are given as one real number: look at cmap
         clims = obj.get_clim()
 
-        if obj.origin == "lower":
-            img_array = numpy.flipud(img_array)
-
         mpl.pyplot.imsave(fname=filename,
                           arr=img_array,
                           cmap=obj.get_cmap(),
@@ -44,8 +44,9 @@ def draw_image(data, obj):
     else:
         # RGB (+alpha) information at each point
         assert len(dims) == 3 and dims[2] in [3, 4]
-        # convert to PIL image (after upside-down flip)
-        image = PIL.Image.fromarray(numpy.flipud(img_array))
+        # convert to PIL image
+
+        image = PIL.Image.fromarray(img_array)
         image.save(filename)
 
     # write the corresponding information to the TikZ file

test/helpers.py

@@ -3,6 +3,7 @@
 import matplotlib2tikz
 
 import os
+import shutil
 import tempfile
 import subprocess
 from PIL import Image
@@ -93,6 +94,9 @@ def assert_phash(fig, reference_phash):
         compute_phash(fig)
 
     if reference_phash != phash:
+        # Copy pdf_file in test directory
+        shutil.copy(pdf_file, os.path.dirname(os.path.abspath(__file__)))
+
         # Compute the Hamming distance between the two 64-bit numbers
         hamming_dist = \
             bin(int(phash, 16) ^ int(reference_phash, 16)).count('1')

test/test_image_plot.py

@@ -19,12 +19,12 @@ def plot():
     fig = pp.figure(figsize=figsize)
     ax = pp.axes([0, 0, 1, 1], frameon=False)
     ax.set_axis_off()
-    pp.imshow(lena, origin='lower')
+    pp.imshow(lena)
     # Set the current color map to HSV.
     pp.hsv()
     pp.colorbar()
     return fig
 
 
 def test():
-    helpers.assert_phash(plot(), '7558d3b30f634b06')
+    helpers.assert_phash(plot(), '75c3d34d1d0d4b91')

test/test_rotated_labels.py

@@ -62,7 +62,7 @@ def test_rotated_labels_parameters(x_alignment, y_alignment,
     matplotlib2tikz.save(
         tikz_file,
         figurewidth='7.5cm',
-        extra=extra_dict
+        extra_axis_parameters=extra_dict
         )
 
     # close figure
@@ -101,7 +101,7 @@ def test_rotated_labels_parameters_different_values(x_tick_label_width,
     matplotlib2tikz.save(
         tikz_file,
         figurewidth='7.5cm',
-        extra=extra_dict
+        extra_axis_parameters=extra_dict
         )
 
     # close figure