tidied up pull request for legend colors and legend position

Author: danielhkl

matplotlib2tikz/legend.py

@@ -148,6 +148,12 @@ def draw_legend(data, obj):
         position = [0.5, 0.5]
         anchor = 'center'
 
+    # In case of given position via bbox_to_anchor parameter the center
+    # of legend is changed as follows:
+    if obj._bbox_to_anchor:
+        bbox_center = obj.get_bbox_to_anchor()._bbox._points[1]
+        position = [bbox_center[0], bbox_center[1]]
+
     legend_style = []
     if position:
         legend_style.append('at={(%.15g,%.15g)}' % (position[0], position[1]))
@@ -193,6 +199,17 @@ def draw_legend(data, obj):
             'legend columns={}'.format(obj._ncol)
             )
 
+    # Set color of lines in legend
+    data['legend colors'] = []
+    for handle in obj.legendHandles:
+        try:
+            data, legend_color, _ = mycol.mpl_color2xcolor(data,
+                                                            handle.get_color())
+            data['legend colors'].append('\\addlegendimage{no markers, %s}\n'
+                                        % legend_color)
+        except(AttributeError):
+            data['legend colors'] = []
+
     # Write styles to data
     if legend_style:
         style = 'legend style={%s}' % ', '.join(legend_style)

matplotlib2tikz/save.py

@@ -311,6 +311,8 @@ def _recurse(data, obj):
             content.extend(cont, child.get_zorder())
         elif isinstance(child, mpl.legend.Legend):
             data = legend.draw_legend(data, child)
+            if data['legend colors']:
+                content.extend(data['legend colors'], 0)
         elif isinstance(
                 child,
                 (

test/test_legend_best_location.py

@@ -62,5 +62,5 @@ def plot():
 
 def test():
     phash = helpers.Phash(plot())
-    assert phash.phash == '839f990d0e877c1d', phash.get_details()
+    assert phash.phash == '879d990d0e8f7c1c', phash.get_details()
     return

test/test_legend_columns.py

@@ -15,7 +15,7 @@ def plot():
 
 def test():
     phash = helpers.Phash(plot())
-    assert phash.phash == '8386de99666939a9', phash.get_details()
+    assert phash.phash == '8387de99666938a9', phash.get_details()
     return
 
 

test/test_legend_labels.py

@@ -24,7 +24,7 @@ def plot():
 
 def test():
     phash = helpers.Phash(plot())
-    assert phash.phash == 'eb785e0aaed68194', phash.get_details()
+    assert phash.phash == 'eb78de0aaed6c110', phash.get_details()
     return
 
 

test/test_legends.py

@@ -31,7 +31,7 @@ def plot():
 
 def test():
     phash = helpers.Phash(plot())
-    assert phash.phash == '7f7ca18386d10eaa', phash.get_details()
+    assert phash.phash == '7f7ca18386d10e8b', phash.get_details()
     return