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

Merge pull request #1880 from jheinen/master

Browse Source 
Added support for discrete contour plots
This commit is contained in:
Michael Krabbe Borregaard 2019-01-06 11:30:33 +01:00 committed by GitHub
commit 3e799fbe21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
REQUIRE
View File

@ -13,4 +13,4 @@ JSON
NaNMath NaNMath
Requires Requires
Contour Contour
GR 0.35.0 GR 0.36.0

11
src/backends/gr.jl
View File

@ -1029,16 +1029,13 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
else else
h = series[:levels] > 1 ? range(zmin, stop=zmax, length=series[:levels]) : [(zmin + zmax) / 2] h = series[:levels] > 1 ? range(zmin, stop=zmax, length=series[:levels]) : [(zmin + zmax) / 2]
end end
if series[:fillrange] != nothing
GR.surface(x, y, z, GR.OPTION_CELL_ARRAY)
else
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) / (sum(gr_plot_size) * 0.001)))
if plot_color(series[:linecolor]) == [plot_color(:black)] if series[:fillrange] != nothing
GR.contour(x, y, h, z, 0 + (series[:contour_labels] == true ? 1 : 0)) GR.contourf(x, y, h, z, series[:contour_labels] == true ? 1 : 0)
else else
GR.contour(x, y, h, z, 1000 + (series[:contour_labels] == true ? 1 : 0)) coff = plot_color(series[:linecolor]) == [plot_color(:black)] ? 0 : 1000
end GR.contour(x, y, h, z, coff + (series[:contour_labels] == true ? 1 : 0))
end end
# create the colorbar of contour levels # create the colorbar of contour levels