Merge pull request #283 from nschloe/legend-line-scatter

properly add legend for scatter plots

Author: nschloe

matplotlib2tikz/path.py

@@ -199,6 +199,9 @@ def draw_pathcollection(data, obj):
             content.append(fmt.format(*tuple(d)))
         content.append("};\n")
 
+    if legend_text is not None:
+        content.append("\\addlegendentry{{{}}}\n".format(legend_text))
+
     return data, content
 
 

test/test_image_plot_lower.py

@@ -23,8 +23,8 @@ def plot():
     ax = plt.axes([0, 0, 1, 1], frameon=False)
     ax.set_axis_off()
     plt.imshow(img, cmap="viridis", origin="lower")
-    # Set the current color map to HSV.
-    plt.hsv()
+    # Setting the current color map to HSV messes up other plots
+    # plt.hsv()
     plt.colorbar()
     return fig
 

test/test_image_plot_lower_reference.tex

@@ -3,19 +3,7 @@
 \begin{axis}[
 colorbar,
 colorbar style={ylabel={}},
-colormap={mymap}{[1pt]
-  rgb(0pt)=(1,0,0);
-  rgb(10pt)=(1,0.9375,0);
-  rgb(11pt)=(0.96875,1,0);
-  rgb(21pt)=(0.03125,1,0);
-  rgb(22pt)=(0,1,0.0625);
-  rgb(32pt)=(0,1,1);
-  rgb(42pt)=(0,0.0625,1);
-  rgb(43pt)=(0.03125,0,1);
-  rgb(53pt)=(0.96875,0,1);
-  rgb(54pt)=(1,0,0.9375);
-  rgb(63pt)=(1,0,0.09375)
-},
+colormap/viridis,
 hide x axis,
 hide y axis,
 point meta max=1,

test/test_image_plot_upper.py

@@ -22,14 +22,14 @@ def plot():
 
     plt.imshow(img, cmap="viridis", origin="upper")
 
-    # Set the current color map to HSV.
-    plt.hsv()
+    # Setting the current color map to HSV messes up other plots
+    # plt.hsv()
     plt.colorbar()
     return fig
 
 
 # TODO reintroduce
 # from helpers import assert_equality
 # def test():
-#     assert_equality(plot, "test_image_plot_lower_reference.tex")
+#     assert_equality(plot, __file__[:-3] + "_reference.tex")
 #     return

test/test_image_plot_upper_reference.tex

@@ -3,19 +3,7 @@
 \begin{axis}[
 colorbar,
 colorbar style={ylabel={}},
-colormap={mymap}{[1pt]
-  rgb(0pt)=(1,0,0);
-  rgb(10pt)=(1,0.9375,0);
-  rgb(11pt)=(0.96875,1,0);
-  rgb(21pt)=(0.03125,1,0);
-  rgb(22pt)=(0,1,0.0625);
-  rgb(32pt)=(0,1,1);
-  rgb(42pt)=(0,0.0625,1);
-  rgb(43pt)=(0.03125,0,1);
-  rgb(53pt)=(0.96875,0,1);
-  rgb(54pt)=(1,0,0.9375);
-  rgb(63pt)=(1,0,0.09375)
-},
+colormap/viridis,
 hide x axis,
 hide y axis,
 point meta max=1,

test/test_legend_line_scatter.py

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+#
+import matplotlib.pyplot as plt
+import numpy as np
+
+from helpers import assert_equality
+
+
+def plot():
+    fig = plt.figure()
+    t = np.arange(5)
+    np.random.seed(123)
+    x = t
+    plt.plot(t, x, label="line")
+    plt.scatter(t, x, label="scatter")
+    plt.legend()
+    return fig
+
+
+def test():
+    assert_equality(plot, __file__[:-3] + "_reference.tex")
+    return
+
+
+if __name__ == "__main__":
+    import helpers
+
+    helpers.compare_mpl_latex(plot)
+    # helpers.print_tree(plot())

test/test_legend_line_scatter_reference.tex

@@ -0,0 +1,36 @@
+\begin{tikzpicture}
+
+\definecolor{color0}{rgb}{0.12156862745098,0.466666666666667,0.705882352941177}
+
+\begin{axis}[
+legend cell align={left},
+legend style={at={(0.03,0.97)}, anchor=north west, draw=white!80.0!black},
+tick align=outside,
+tick pos=left,
+x grid style={white!69.01960784313725!black},
+xmin=-0.229274193548387, xmax=4.22927419354839,
+y grid style={white!69.01960784313725!black},
+ymin=-0.239285714285714, ymax=4.23928571428571
+]
+\addplot [only marks, draw=color0, fill=color0, colormap/viridis]
+table{%
+x                      y
+0 0
+1 1
+2 2
+3 3
+4 4
+};
+\addlegendentry{scatter}
+\addplot [semithick, color0]
+table {%
+0 0
+1 1
+2 2
+3 3
+4 4
+};
+\addlegendentry{line}
+\end{axis}
+
+\end{tikzpicture}

test/test_line_collection_reference.tex

@@ -5,19 +5,7 @@
 \begin{axis}[
 colorbar,
 colorbar style={ylabel={Line Number}},
-colormap={mymap}{[1pt]
-  rgb(0pt)=(1,0,0);
-  rgb(10pt)=(1,0.9375,0);
-  rgb(11pt)=(0.96875,1,0);
-  rgb(21pt)=(0.03125,1,0);
-  rgb(22pt)=(0,1,0.0625);
-  rgb(32pt)=(0,1,1);
-  rgb(42pt)=(0,0.0625,1);
-  rgb(43pt)=(0.03125,0,1);
-  rgb(53pt)=(0.96875,0,1);
-  rgb(54pt)=(1,0,0.9375);
-  rgb(63pt)=(1,0,0.09375)
-},
+colormap/viridis,
 point meta max=9,
 point meta min=0,
 tick align=outside,

test/test_noise2_reference.tex

@@ -3,19 +3,7 @@
 \begin{axis}[
 colorbar horizontal,
 colorbar style={xtick={-1,0,1},xticklabels={Low,Medium,High}},
-colormap={mymap}{[1pt]
-  rgb(0pt)=(1,0,0);
-  rgb(10pt)=(1,0.9375,0);
-  rgb(11pt)=(0.96875,1,0);
-  rgb(21pt)=(0.03125,1,0);
-  rgb(22pt)=(0,1,0.0625);
-  rgb(32pt)=(0,1,1);
-  rgb(42pt)=(0,0.0625,1);
-  rgb(43pt)=(0.03125,0,1);
-  rgb(53pt)=(0.96875,0,1);
-  rgb(54pt)=(1,0,0.9375);
-  rgb(63pt)=(1,0,0.09375)
-},
+colormap/viridis,
 point meta max=1,
 point meta min=-1,
 tick align=outside,

test/test_noise_reference.tex

@@ -3,19 +3,7 @@
 \begin{axis}[
 colorbar,
 colorbar style={ytick={-1,0,1},yticklabels={< -1,0,> 1},ylabel={}},
-colormap={mymap}{[1pt]
-  rgb(0pt)=(1,0,0);
-  rgb(10pt)=(1,0.9375,0);
-  rgb(11pt)=(0.96875,1,0);
-  rgb(21pt)=(0.03125,1,0);
-  rgb(22pt)=(0,1,0.0625);
-  rgb(32pt)=(0,1,1);
-  rgb(42pt)=(0,0.0625,1);
-  rgb(43pt)=(0.03125,0,1);
-  rgb(53pt)=(0.96875,0,1);
-  rgb(54pt)=(1,0,0.9375);
-  rgb(63pt)=(1,0,0.09375)
-},
+colormap/viridis,
 point meta max=1,
 point meta min=-1,
 tick align=outside,