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

fix rebase woes

Browse Source
This commit is contained in:
Simon Christ 2021-10-18 15:49:58 +02:00
parent 9a500d6be1
commit 318ae94552
4 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/backends/gr.jl
View File

@ -1236,8 +1236,7 @@ function gr_legend_pos(theta::Real, leg, viewport_plotarea; axisclearance = noth
end end
function gr_get_legend_geometry(viewport_plotarea, sp) function gr_get_legend_geometry(viewport_plotarea, sp)
legendn = 0 legendn = legendw = dy = 0
legendw = 0
if sp[:legend_position] != :none if sp[:legend_position] != :none
GR.savestate() GR.savestate()
GR.selntran(0) GR.selntran(0)

4
src/backends/pgfplotsx.jl
View File

@ -1235,7 +1235,9 @@ end
function pgfx_axis!(opt::PGFPlotsX.Options, sp::Subplot, letter) function pgfx_axis!(opt::PGFPlotsX.Options, sp::Subplot, letter)
axis = sp[get_attr_symbol(letter, :axis)] axis = sp[get_attr_symbol(letter, :axis)]
# turn off scaled ticks # turn off scaled ticks
push!(opt, "scaled $(letter) ticks" => "false", string(letter, :label) => axis[:guide])
tick_color = plot_color(axis[:foreground_color_axis])
push!( push!(
opt, opt,
"$(letter) tick style" => "$(letter) tick style" =>

2
src/backends/unicodeplots.jl
View File

@ -54,7 +54,7 @@ function unicodeplots_rebuild(plt::Plot{UnicodePlotsBackend})
o = UnicodePlots.Plot(x, y, _canvas_map[canvas_type]; kw...) o = UnicodePlots.Plot(x, y, _canvas_map[canvas_type]; kw...)
for series in series_list(sp) for series in series_list(sp)
addUnicodeSeries!(o, series.plotattributes, sp[:legend_position] != :none, xlim, ylim) o = addUnicodeSeries!(sp, o, kw, series, sp[:legend_position] != :none)
end end
for ann in sp[:annotations] for ann in sp[:annotations]

28
src/consts.jl
View File

@ -5,14 +5,26 @@ const _initial_defaults = deepcopy(_all_defaults)
const _initial_axis_defaults = deepcopy(_axis_defaults) const _initial_axis_defaults = deepcopy(_axis_defaults)
# to be able to reset font sizes to initial values # to be able to reset font sizes to initial values
const _initial_fontsizes = Dict( const _initial_plt_fontsizes =
Dict(:plot_titlefontsize => _plot_defaults[:plot_titlefontsize])
const _initial_sp_fontsizes = Dict(
:titlefontsize => _subplot_defaults[:titlefontsize], :titlefontsize => _subplot_defaults[:titlefontsize],
:legend_font_pointsize => _subplot_defaults[:legend_font_pointsize], :legendfontsize => _subplot_defaults[:legend_font_pointsize],
:legend_title_font_pointsize => _subplot_defaults[:legend_title_font_pointsize], :legendtitlefontsize => _subplot_defaults[:legend_title_font_pointsize],
:tickfontsize => _axis_defaults[:tickfontsize], :annotationfontsize => _subplot_defaults[:annotationfontsize],
:colorbar_tickfontsize => _subplot_defaults[:colorbar_tickfontsize],
:colorbar_titlefontsize => _subplot_defaults[:colorbar_titlefontsize],
)
const _initial_ax_fontsizes = Dict(
:tickfontsize => _axis_defaults[:tickfontsize],
:guidefontsize => _axis_defaults[:guidefontsize], :guidefontsize => _axis_defaults[:guidefontsize],
) )
const _initial_fontsizes =
merge(_initial_plt_fontsizes, _initial_sp_fontsizes, _initial_ax_fontsizes)
const _internal_args = const _internal_args =
[:plot_object, :series_plotindex, :markershape_to_add, :letter, :idxfilter] [:plot_object, :series_plotindex, :markershape_to_add, :letter, :idxfilter]
@ -23,10 +35,10 @@ const _plot_args = sort(union(collect(keys(_plot_defaults))))
const _magic_axis_args = [:axis, :tickfont, :guidefont, :grid, :minorgrid] const _magic_axis_args = [:axis, :tickfont, :guidefont, :grid, :minorgrid]
const _magic_subplot_args = [ const _magic_subplot_args = [
:titlefont, :title_font,
:legendfont, :legend_font,
:legend_titlefont, :legend_title_font,
:plot_titlefont, :plot_title_font,
:colorbar_titlefont, :colorbar_titlefont,
] ]
const _magic_series_args = [:line, :marker, :fill] const _magic_series_args = [:line, :marker, :fill]