From 756cccb114e30bf23cc7f809c203597914120098 Mon Sep 17 00:00:00 2001 From: Daniel Schwabeneder Date: Thu, 30 Apr 2020 09:46:13 +0200 Subject: [PATCH 1/3] remove lines in legend markers for scatter plots in pyplot [skip ci] --- src/backends/pyplot.jl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/backends/pyplot.jl b/src/backends/pyplot.jl index 7cccc30e..8b7aa3a2 100644 --- a/src/backends/pyplot.jl +++ b/src/backends/pyplot.jl @@ -1308,9 +1308,10 @@ function py_add_legend(plt::Plot, sp::Subplot, ax) linestyle = py_linestyle(series[:seriestype], get_linestyle(series)) ) elseif series[:seriestype] in (:path, :straightline, :scatter) + hasline = get_linewidth(series) > 0 PyPlot.plt."Line2D"((0,1),(0,0), color = py_color(single_color(get_linecolor(series, clims)), get_linealpha(series)), - linewidth = py_thickness_scale(plt, sp[:legendfontsize] / 8), + linewidth = py_thickness_scale(plt, hasline * sp[:legendfontsize] / 8), linestyle = py_linestyle(:path, get_linestyle(series)), marker = py_marker(_cycle(series[:markershape], 1)), markersize = py_thickness_scale(plt, 0.8 * sp[:legendfontsize]), From e44b220b8441e4f929e9e3093e5ae6bd29794452 Mon Sep 17 00:00:00 2001 From: Daniel Schwabeneder Date: Thu, 30 Apr 2020 10:03:21 +0200 Subject: [PATCH 2/3] fix legend marker linewidth for steppre and steppost [skip ci] --- src/backends/pyplot.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backends/pyplot.jl b/src/backends/pyplot.jl index 8b7aa3a2..6e525ca6 100644 --- a/src/backends/pyplot.jl +++ b/src/backends/pyplot.jl @@ -1307,7 +1307,7 @@ function py_add_legend(plt::Plot, sp::Subplot, ax) linewidth = py_thickness_scale(plt, clamp(get_linewidth(series), 0, 5)), linestyle = py_linestyle(series[:seriestype], get_linestyle(series)) ) - elseif series[:seriestype] in (:path, :straightline, :scatter) + elseif series[:seriestype] in (:path, :straightline, :scatter, :steppre, :steppost) hasline = get_linewidth(series) > 0 PyPlot.plt."Line2D"((0,1),(0,0), color = py_color(single_color(get_linecolor(series, clims)), get_linealpha(series)), From 2ea998983d650d7dfc73eb3532d302e51f0889ec Mon Sep 17 00:00:00 2001 From: Daniel Schwabeneder Date: Thu, 30 Apr 2020 10:04:04 +0200 Subject: [PATCH 3/3] fix legend marker for vector of markersizes [skip ci] --- src/backends/pyplot.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backends/pyplot.jl b/src/backends/pyplot.jl index 6e525ca6..0bdf0888 100644 --- a/src/backends/pyplot.jl +++ b/src/backends/pyplot.jl @@ -1317,7 +1317,7 @@ function py_add_legend(plt::Plot, sp::Subplot, ax) markersize = py_thickness_scale(plt, 0.8 * sp[:legendfontsize]), markeredgecolor = py_color(single_color(get_markerstrokecolor(series)), get_markerstrokealpha(series)), markerfacecolor = py_color(single_color(get_markercolor(series, clims)), get_markeralpha(series)), - markeredgewidth = py_thickness_scale(plt, 0.8 * series[:markerstrokewidth] * sp[:legendfontsize] / series[:markersize]) # retain the markersize/markerstroke ratio from the markers on the plot + markeredgewidth = py_thickness_scale(plt, 0.8 * get_markerstrokewidth(series) * sp[:legendfontsize] / first(series[:markersize])) # retain the markersize/markerstroke ratio from the markers on the plot ) else series[:serieshandle][1]