diff --git a/src/backends/gr.jl b/src/backends/gr.jl index 053bc53b..a4cdfd56 100644 --- a/src/backends/gr.jl +++ b/src/backends/gr.jl @@ -2062,7 +2062,7 @@ function gr_draw_surface(series, x, y, z, clims) "Unsupported `:connections` type $(typeof(series[:connections])) for seriestype=$st", ), ) - end + end fillalpha = get_fillalpha(series) n_polygons = length(cns) facecolor = if series[:fillcolor] isa AbstractArray @@ -2070,7 +2070,7 @@ function gr_draw_surface(series, x, y, z, clims) else fill(series[:fillcolor], n_polygons) end - facecolor = map(fc -> set_RGBA_alpha(fillalpha, fc), facecolor) + facecolor = map(fc -> set_RGBA_alpha(fillalpha, fc), facecolor) GR.setborderwidth(get_linewidth(series)) GR.setbordercolorind(gr_getcolorind(get_linecolor(series))) GR.polygonmesh3d(x, y, z, vcat(cns...), signed.(gr_color.(facecolor))) diff --git a/src/backends/pyplot.jl b/src/backends/pyplot.jl index 15df1ce9..0cb1ee40 100644 --- a/src/backends/pyplot.jl +++ b/src/backends/pyplot.jl @@ -1215,10 +1215,14 @@ function _before_layout_calcs(plt::Plot{PyPlotBackend}) spine = sp[:yaxis][:mirror] ? "left" : "right" getproperty(ax.spines, spine)."set_alpha"(intensity) - getproperty(ax.spines, spine)."set_linewidth"(py_thickness_scale(plt, intensity)) + getproperty(ax.spines, spine)."set_linewidth"( + py_thickness_scale(plt, intensity), + ) spine = sp[:xaxis][:mirror] ? "bottom" : "top" - getproperty(ax.spines, spine)."set_linewidth"(py_thickness_scale(plt, intensity)) + getproperty(ax.spines, spine)."set_linewidth"( + py_thickness_scale(plt, intensity), + ) getproperty(ax.spines, spine)."set_alpha"(intensity) elseif sp[:framestyle] == :box ax.tick_params(top = true) # Add ticks too diff --git a/src/colorbars.jl b/src/colorbars.jl index 25bd2b39..14f79239 100644 --- a/src/colorbars.jl +++ b/src/colorbars.jl @@ -5,11 +5,13 @@ process_clims(s::Union{Symbol,Nothing,Missing}) = ignorenan_extrema # don't specialize on ::Function otherwise python functions won't work process_clims(f) = f -const sp_clims = IdDict{Subplot, Tuple{Float64, Float64}}() -const series_clims = IdDict{Series, Tuple{Float64, Float64}}() +const sp_clims = IdDict{Subplot,Tuple{Float64,Float64}}() +const series_clims = IdDict{Series,Tuple{Float64,Float64}}() -get_clims(sp::Subplot)::Tuple{Float64,Float64} = haskey(sp_clims, sp) ? sp_clims[sp] : update_clims(sp) -get_clims(series::Series)::Tuple{Float64,Float64} = haskey(series_clims, series) ? series_clims[series] : update_clims(series) +get_clims(sp::Subplot)::Tuple{Float64,Float64} = + haskey(sp_clims, sp) ? sp_clims[sp] : update_clims(sp) +get_clims(series::Series)::Tuple{Float64,Float64} = + haskey(series_clims, series) ? series_clims[series] : update_clims(series) get_clims(sp::Subplot, series::Series)::Tuple{Float64,Float64} = series[:colorbar_entry] ? get_clims(sp) : get_clims(series) @@ -53,9 +55,11 @@ function update_clims(series::Series, op = ignorenan_extrema)::Tuple{Float64,Flo return series_clims[series] = zmin <= zmax ? (zmin, zmax) : (NaN, NaN) end -update_clims(zmin, zmax, vals::AbstractSurface, op)::Tuple{Float64, Float64} = update_clims(zmin, zmax, vals.surf, op) -update_clims(zmin, zmax, vals::Any, op)::Tuple{Float64, Float64} = _update_clims(zmin, zmax, op(vals)...) -update_clims(zmin, zmax, ::Nothing, ::Any)::Tuple{Float64, Float64} = zmin, zmax +update_clims(zmin, zmax, vals::AbstractSurface, op)::Tuple{Float64,Float64} = + update_clims(zmin, zmax, vals.surf, op) +update_clims(zmin, zmax, vals::Any, op)::Tuple{Float64,Float64} = + _update_clims(zmin, zmax, op(vals)...) +update_clims(zmin, zmax, ::Nothing, ::Any)::Tuple{Float64,Float64} = zmin, zmax _update_clims(zmin, zmax, emin, emax) = NaNMath.min(zmin, emin), NaNMath.max(zmax, emax) diff --git a/src/precompile_includer.jl b/src/precompile_includer.jl index c5df391f..2a19fe91 100644 --- a/src/precompile_includer.jl +++ b/src/precompile_includer.jl @@ -7,10 +7,9 @@ ismultiversion = false @static if !should_precompile # nothing elseif !ismultios && !ismultiversion - @static if isfile(joinpath( - @__DIR__, - "../deps/SnoopCompile/precompile/precompile_Plots.jl", - )) + @static if isfile( + joinpath(@__DIR__, "../deps/SnoopCompile/precompile/precompile_Plots.jl"), + ) include("../deps/SnoopCompile/precompile/precompile_Plots.jl") _precompile_() end