mantao/Plots.jl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Format .jl files [skip ci]

Browse Source
This commit is contained in:
t-bltg 2021-10-31 00:10:26 +00:00 committed by GitHub
parent 19b70c06ff
commit d4ec59fdbd
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/backends/pyplot.jl
View File

@ -1635,7 +1635,10 @@ function py_add_legend(plt::Plot, sp::Subplot, ax)
dash_capstyle = "butt", dash_capstyle = "butt",
dash_joinstyle = "miter", dash_joinstyle = "miter",
marker = py_marker(_cycle(series[:markershape], 1)), marker = py_marker(_cycle(series[:markershape], 1)),
markersize = py_thickness_scale(plt, 0.8 * sp[:legend_font_pointsize]), markersize = py_thickness_scale(
plt,
0.8 * sp[:legend_font_pointsize],
),
markeredgecolor = py_color( markeredgecolor = py_color(
single_color(get_markerstrokecolor(series)), single_color(get_markerstrokecolor(series)),
get_markerstrokealpha(series), get_markerstrokealpha(series),
@ -1646,8 +1649,9 @@ function py_add_legend(plt::Plot, sp::Subplot, ax)
), ),
markeredgewidth = py_thickness_scale( markeredgewidth = py_thickness_scale(
plt, plt,
0.8 * get_markerstrokewidth(series) * sp[:legend_font_pointsize] / 0.8 *
first(series[:markersize]), get_markerstrokewidth(series) *
sp[:legend_font_pointsize] / first(series[:markersize]),
), # retain the markersize/markerstroke ratio from the markers on the plot ), # retain the markersize/markerstroke ratio from the markers on the plot
) )
push!(handles, handle) push!(handles, handle)

2
src/colorbars.jl
View File

@ -9,7 +9,7 @@ get_clims(sp::Subplot)::Tuple{Float64,Float64} =
haskey(sp.attr, :clims_calculated) ? sp[:clims_calculated] : update_clims(sp) haskey(sp.attr, :clims_calculated) ? sp[:clims_calculated] : update_clims(sp)
get_clims(series::Series)::Tuple{Float64,Float64} = get_clims(series::Series)::Tuple{Float64,Float64} =
haskey(series.plotattributes, :clims_calculated) ? haskey(series.plotattributes, :clims_calculated) ?
series[:clims_calculated]::Tuple{Float64,Float64} : update_clims(series) series[:clims_calculated]::Tuple{Float64,Float64} : update_clims(series)
get_clims(sp::Subplot, series::Series)::Tuple{Float64,Float64} = get_clims(sp::Subplot, series::Series)::Tuple{Float64,Float64} =
series[:colorbar_entry] ? get_clims(sp) : get_clims(series) series[:colorbar_entry] ? get_clims(sp) : get_clims(series)