Merge pull request #164 from danielhkl/master

missing yLabel at colorbar

Author: nschloe

matplotlib2tikz/axes.py

@@ -300,6 +300,7 @@ def __init__(self, data, obj):
                 colorbar_ticklabels = colorbar.ax.get_xticklabels()
                 colorbar_ticklabels_minor = colorbar.ax.get_xticklabels(
                     'minor')
+
                 colorbar_styles.extend(
                     _get_ticks(data, 'x', colorbar_ticks, colorbar_ticklabels)
                     )
@@ -334,6 +335,7 @@ def __init__(self, data, obj):
                 # Getting the labels via get_* might not actually be suitable:
                 # they might not reflect the current state.
                 colorbar_ticklabels = colorbar.ax.get_yticklabels()
+                colorbar_ylabel = colorbar.ax.get_ylabel()
                 colorbar_ticklabels_minor = colorbar.ax.get_yticklabels(
                     'minor')
                 colorbar_styles.extend(
@@ -344,6 +346,7 @@ def __init__(self, data, obj):
                         data, 'minor y', colorbar_ticks_minor,
                         colorbar_ticklabels_minor)
                     )
+                colorbar_styles.append('ylabel={'+ colorbar_ylabel +'}')
 
             mycolormap, is_custom_cmap = _mpl_cmap2pgf_cmap(
                     colorbar.get_cmap()

matplotlib2tikz/image.py

@@ -27,9 +27,6 @@ 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()
@@ -45,6 +42,8 @@ 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":
+            img_array = numpy.flipud(img_array)
         image = PIL.Image.fromarray(img_array)
         image.save(filename, origin=obj.origin)
 

test/test_line_collection.py

@@ -53,4 +53,4 @@ def plot():
 
 
 def test():
-    helpers.assert_phash(plot(), '4b52b5bdb45ca462')
+    helpers.assert_phash(plot(), '5356a5adac9cac62')