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

Format .jl files [skip ci] (#3801)

Browse Source 
Co-authored-by: t-bltg <t-bltg@users.noreply.github.com>
This commit is contained in:
github-actions[bot] 2021-09-13 09:18:59 +02:00 committed by GitHub
parent 942fb38dcd
commit 7da990b23f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/backends/pyplot.jl
View File

@ -24,7 +24,6 @@ pycollections = PyPlot.pyimport("matplotlib.collections")
pyart3d = PyPlot.art3D pyart3d = PyPlot.art3D
pyrcparams = PyPlot.PyDict(PyPlot.matplotlib."rcParams") pyrcparams = PyPlot.PyDict(PyPlot.matplotlib."rcParams")
# "support" matplotlib v3.4 # "support" matplotlib v3.4
if PyPlot.version < v"3.4" if PyPlot.version < v"3.4"
@warn("You are using Matplotlib $(PyPlot.version), which is no longer @warn("You are using Matplotlib $(PyPlot.version), which is no longer
@ -180,12 +179,12 @@ py_fillstyle(fillstyle::Symbol) = string(fillstyle)
function py_get_matching_math_font(parent_fontfamily) function py_get_matching_math_font(parent_fontfamily)
# matplotlib supported math fonts according to # matplotlib supported math fonts according to
# https://matplotlib.org/stable/tutorials/text/mathtext.html # https://matplotlib.org/stable/tutorials/text/mathtext.html
py_math_supported_fonts = Dict{String, String}( py_math_supported_fonts = Dict{String,String}(
"sans-serif" => "dejavusans", "sans-serif" => "dejavusans",
"serif" => "dejavuserif", "serif" => "dejavuserif",
"cm" => "cm", "cm" => "cm",
"stix" => "stix", "stix" => "stix",
"stixsans" => "stixsans" "stixsans" => "stixsans",
) )
# Fallback to "dejavusans" or "dejavuserif" in case the parentfont is different # Fallback to "dejavusans" or "dejavuserif" in case the parentfont is different
# from supported by matplotlib fonts # from supported by matplotlib fonts
@ -1002,7 +1001,9 @@ function _before_layout_calcs(plt::Plot{PyPlotBackend})
py_thickness_scale(plt, sp[:titlefontsize]), py_thickness_scale(plt, sp[:titlefontsize]),
) )
getproperty(ax, func)."set_family"(sp[:titlefontfamily]) getproperty(ax, func)."set_family"(sp[:titlefontfamily])
getproperty(ax, func)."set_math_fontfamily"(py_get_matching_math_font(sp[:titlefontfamily])) getproperty(ax, func)."set_math_fontfamily"(
py_get_matching_math_font(sp[:titlefontfamily]),
)
getproperty(ax, func)."set_color"(py_color(sp[:titlefontcolor])) getproperty(ax, func)."set_color"(py_color(sp[:titlefontcolor]))
# ax[:set_title](sp[:title], loc = loc) # ax[:set_title](sp[:title], loc = loc)
end end
@ -1114,12 +1115,15 @@ function _before_layout_calcs(plt::Plot{PyPlotBackend})
ticks_letter = :y ticks_letter = :y
end end
py_set_scale(cb.ax, sp, sp[:colorbar_scale], ticks_letter) py_set_scale(cb.ax, sp, sp[:colorbar_scale], ticks_letter)
sp[:colorbar_ticks] == :native ? nothing : py_set_ticks(sp, cb.ax, ticks, ticks_letter) sp[:colorbar_ticks] == :native ? nothing :
py_set_ticks(sp, cb.ax, ticks, ticks_letter)
for lab in cbar_axis."get_ticklabels"() for lab in cbar_axis."get_ticklabels"()
lab."set_fontsize"(py_thickness_scale(plt, sp[:colorbar_tickfontsize])) lab."set_fontsize"(py_thickness_scale(plt, sp[:colorbar_tickfontsize]))
lab."set_family"(sp[:colorbar_tickfontfamily]) lab."set_family"(sp[:colorbar_tickfontfamily])
lab."set_math_fontfamily"(py_get_matching_math_font(sp[:colorbar_tickfontfamily])) lab."set_math_fontfamily"(
py_get_matching_math_font(sp[:colorbar_tickfontfamily]),
)
lab."set_color"(py_color(sp[:colorbar_tickfontcolor])) lab."set_color"(py_color(sp[:colorbar_tickfontcolor]))
end end
@ -1229,7 +1233,8 @@ function _before_layout_calcs(plt::Plot{PyPlotBackend})
fontProperties = PyPlot.PyCall.PyDict( fontProperties = PyPlot.PyCall.PyDict(
Dict( Dict(
"family" => axis[:tickfontfamily], "family" => axis[:tickfontfamily],
"math_fontfamily" => py_get_matching_math_font(axis[:tickfontfamily]), "math_fontfamily" =>
py_get_matching_math_font(axis[:tickfontfamily]),
"size" => py_thickness_scale(plt, axis[:tickfontsize]), "size" => py_thickness_scale(plt, axis[:tickfontsize]),
"rotation" => axis[:tickfontrotation], "rotation" => axis[:tickfontrotation],
), ),
@ -1249,7 +1254,6 @@ function _before_layout_calcs(plt::Plot{PyPlotBackend})
) )
end end
axis[:ticks] == :native ? nothing : py_set_ticks(sp, ax, ticks, letter) axis[:ticks] == :native ? nothing : py_set_ticks(sp, ax, ticks, letter)
# Tick marks # Tick marks
intensity = 0.5 # This value corresponds to scaling of other grid elements intensity = 0.5 # This value corresponds to scaling of other grid elements
@ -1266,7 +1270,9 @@ function _before_layout_calcs(plt::Plot{PyPlotBackend})
end end
pyaxis."label"."set_fontsize"(py_thickness_scale(plt, axis[:guidefontsize])) pyaxis."label"."set_fontsize"(py_thickness_scale(plt, axis[:guidefontsize]))
pyaxis."label"."set_family"(axis[:guidefontfamily]) pyaxis."label"."set_family"(axis[:guidefontfamily])
pyaxis."label"."set_math_fontfamily"(py_get_matching_math_font(axis[:guidefontfamily])) pyaxis."label"."set_math_fontfamily"(
py_get_matching_math_font(axis[:guidefontfamily]),
)
if (RecipesPipeline.is3d(sp)) if (RecipesPipeline.is3d(sp))
pyaxis."set_rotate_label"(false) pyaxis."set_rotate_label"(false)

7
src/precompile_includer.jl
View File

@ -7,10 +7,9 @@ ismultiversion = false
@static if !should_precompile @static if !should_precompile
# nothing # nothing
elseif !ismultios && !ismultiversion elseif !ismultios && !ismultiversion
@static if isfile(joinpath( @static if isfile(
@__DIR__, joinpath(@__DIR__, "../deps/SnoopCompile/precompile/precompile_Plots.jl"),
"../deps/SnoopCompile/precompile/precompile_Plots.jl", )
))
include("../deps/SnoopCompile/precompile/precompile_Plots.jl") include("../deps/SnoopCompile/precompile/precompile_Plots.jl")
_precompile_() _precompile_()
end end