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

bump GR version to 0.46

Browse Source
This commit is contained in:
Josef Heinen 2020-01-27 16:25:43 +01:00
parent 45c434b5ed
commit 39c97ecdc5
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Project.toml
View File

@ -34,7 +34,7 @@ UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
Contour = "0.5" Contour = "0.5"
FFMPEG = "0.2" FFMPEG = "0.2"
FixedPointNumbers = "0.6, 0.7" FixedPointNumbers = "0.6, 0.7"
GR = "0.45" GR = "0.46"
GeometryTypes = "0.7" GeometryTypes = "0.7"
JSON = "0.21" JSON = "0.21"
Measures = "0.3" Measures = "0.3"

16
src/backends/gr.jl
View File

@ -319,10 +319,15 @@ function gr_draw_marker(xi, yi, msize, shape::Shape)
GR.selntran(1) GR.selntran(1)
end end
function nominal_size()
w, h = gr_plot_size
min(w, h) / 500
end
# draw ONE symbol marker # draw ONE symbol marker
function gr_draw_marker(xi, yi, msize::Number, shape::Symbol) function gr_draw_marker(xi, yi, msize::Number, shape::Symbol)
GR.setmarkertype(gr_markertype[shape]) GR.setmarkertype(gr_markertype[shape])
GR.setmarkersize(0.3msize) GR.setmarkersize(0.3msize / nominal_size())
GR.polymarker([xi], [yi]) GR.polymarker([xi], [yi])
end end
@ -338,7 +343,7 @@ function gr_draw_markers(series::Series, x, y, clims, msize = series[:markersize
for i=eachindex(x) for i=eachindex(x)
msi = _cycle(msize, i) msi = _cycle(msize, i)
shape = _cycle(shapes, i) shape = _cycle(shapes, i)
i
GR.setborderwidth(series[:markerstrokewidth]); GR.setborderwidth(series[:markerstrokewidth]);
gr_set_bordercolor(get_markerstrokecolor(series, i)); gr_set_bordercolor(get_markerstrokecolor(series, i));
gr_set_markercolor(get_markercolor(series, clims, i)); gr_set_markercolor(get_markercolor(series, clims, i));
@ -353,7 +358,8 @@ end
function gr_set_line(lw, style, c) #, a) function gr_set_line(lw, style, c) #, a)
GR.setlinetype(gr_linetype[style]) GR.setlinetype(gr_linetype[style])
GR.setlinewidth(_gr_thickness_scaling[1] * max(0, lw)) w, h = gr_plot_size
GR.setlinewidth(_gr_thickness_scaling[1] * max(0, lw / nominal_size()))
gr_set_linecolor(c) #, a) gr_set_linecolor(c) #, a)
end end
@ -661,7 +667,7 @@ function gr_display(plt::Plot, fmt="")
_gr_thickness_scaling[1] = plt[:thickness_scaling] _gr_thickness_scaling[1] = plt[:thickness_scaling]
dpi_factor = plt[:dpi] / Plots.DPI dpi_factor = plt[:dpi] / Plots.DPI
if fmt == "svg" || fmt == "png" if fmt == "svg"
dpi_factor *= 4 dpi_factor *= 4
end end
@ -1625,7 +1631,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
elseif st == :contour elseif st == :contour
GR.setspace(clims[1], clims[2], 0, 90) GR.setspace(clims[1], clims[2], 0, 90)
GR.setlinetype(gr_linetype[get_linestyle(series)]) GR.setlinetype(gr_linetype[get_linestyle(series)])
GR.setlinewidth(max(0, get_linewidth(series) / (sum(gr_plot_size) * 0.001))) GR.setlinewidth(max(0, get_linewidth(series)) / nominal_size())
is_lc_black = let black=plot_color(:black) is_lc_black = let black=plot_color(:black)
plot_color(series[:linecolor]) in (black,[black]) plot_color(series[:linecolor]) in (black,[black])
end end