properly forget paths from legends

Author: nschloe

matplotlib2tikz/line2d.py

@@ -8,27 +8,7 @@
 from . import path as mypath
 from . import files
 
-
-def _has_legend(axes):
-    return axes.get_legend() is not None
-
-
-def _get_legend_text(line):
-    """Check if line is in legend.
-    """
-    leg = line.axes.get_legend()
-    if leg is None:
-        return None
-
-    keys = [l.get_label() for l in leg.get_lines()]
-    values = [l.get_text() for l in leg.texts]
-
-    label = line.get_label()
-    d = dict(zip(keys, values))
-    if label in d:
-        return d[label]
-
-    return None
+from .util import get_legend_text, has_legend
 
 
 def draw_line2d(data, obj):
@@ -84,8 +64,8 @@ def draw_line2d(data, obj):
 
     # Check if a line is in a legend and forget it if not.
     # Fixes <https://github.com/nschloe/matplotlib2tikz/issues/167>.
-    legend_text = _get_legend_text(obj)
-    if legend_text is None and _has_legend(obj.axes):
+    legend_text = get_legend_text(obj)
+    if legend_text is None and has_legend(obj.axes):
         addplot_options.append("forget plot")
 
     # process options

matplotlib2tikz/path.py

@@ -6,6 +6,8 @@
 from . import color
 from .axes import _mpl_cmap2pgf_cmap
 
+from .util import has_legend, get_legend_text
+
 
 def draw_path(data, path, draw_options=None, simplify=None):
     """Adds code for drawing an ordinary path in PGFPlots (TikZ).
@@ -159,10 +161,11 @@ def draw_pathcollection(data, obj):
 
     if obj.get_cmap():
         mycolormap, is_custom_cmap = _mpl_cmap2pgf_cmap(obj.get_cmap(), data)
-        if is_custom_cmap:
-            draw_options.append("colormap=" + mycolormap)
-        else:
-            draw_options.append("colormap/" + mycolormap)
+        draw_options.append("colormap" + ("=" if is_custom_cmap else "/") + mycolormap)
+
+    legend_text = get_legend_text(obj)
+    if legend_text is None and has_legend(obj.axes):
+        draw_options.append("forget plot")
 
     for path in obj.get_paths():
         if is_contour:

matplotlib2tikz/save.py

@@ -224,7 +224,7 @@ def get_tikz_code(
 \\usepackage{{pgfplots}}
 \\usepgfplotslibrary{{groupplots}}
 \\pgfplotsset{{compat=newest}}
-\\DeclareUnicodeCharacter{{2212}}{{-}}
+\\DeclareUnicodeCharacter{{2212}}{{−}}
 \\begin{{document}}
 {}
 \\end{{document}}""".format(

matplotlib2tikz/util.py

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+#
+
+
+def has_legend(axes):
+    return axes.get_legend() is not None
+
+
+def get_legend_text(obj):
+    """Check if line is in legend.
+    """
+    leg = obj.axes.get_legend()
+    if leg is None:
+        return None
+
+    keys = [l.get_label() for l in leg.legendHandles if l is not None]
+    values = [l.get_text() for l in leg.texts]
+
+    label = obj.get_label()
+    d = dict(zip(keys, values))
+    if label in d:
+        return d[label]
+
+    return None