Fix linewidth and markersize for GR 0.45.0

This commit is contained in:
Josef Heinen 2020-01-24 13:29:59 +01:00
parent 22e8718e85
commit d093d1ad7e
2 changed files with 4 additions and 5 deletions

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.44, 0.45" GR = "0.45"
GeometryTypes = "0.7" GeometryTypes = "0.7"
JSON = "0.21" JSON = "0.21"
Measures = "0.3" Measures = "0.3"

View File

@ -321,8 +321,8 @@ 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])
w, h = gr_plot_size GR.setmarkersize(0.3msize)
GR.setmarkersize(0.3msize / ((w + h) * 0.001)) GR.setborderwidth(0)
GR.polymarker([xi], [yi]) GR.polymarker([xi], [yi])
end end
@ -363,8 +363,7 @@ 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])
w, h = gr_plot_size GR.setlinewidth(_gr_thickness_scaling[1] * max(0, lw))
GR.setlinewidth(_gr_thickness_scaling[1] * max(0, lw / ((w + h) * 0.001)))
gr_set_linecolor(c) #, a) gr_set_linecolor(c) #, a)
end end