From 53e27dbc38a99fffa1dfa4d28ce478cbb2cc22dc Mon Sep 17 00:00:00 2001 From: Josef Heinen Date: Sun, 6 Jan 2019 11:24:45 +0100 Subject: [PATCH] Added support for discrete contour plots --- REQUIRE | 2 +- src/backends/gr.jl | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/REQUIRE b/REQUIRE index aae86c2c..6fad4eba 100644 --- a/REQUIRE +++ b/REQUIRE @@ -13,4 +13,4 @@ JSON NaNMath Requires Contour -GR 0.35.0 +GR 0.36.0 diff --git a/src/backends/gr.jl b/src/backends/gr.jl index 505ad39f..1d4fbca6 100644 --- a/src/backends/gr.jl +++ b/src/backends/gr.jl @@ -1029,16 +1029,13 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas) else h = series[:levels] > 1 ? range(zmin, stop=zmax, length=series[:levels]) : [(zmin + zmax) / 2] end + GR.setlinetype(gr_linetype[get_linestyle(series)]) + GR.setlinewidth(max(0, get_linewidth(series) / (sum(gr_plot_size) * 0.001))) if series[:fillrange] != nothing - GR.surface(x, y, z, GR.OPTION_CELL_ARRAY) + GR.contourf(x, y, h, z, series[:contour_labels] == true ? 1 : 0) else - GR.setlinetype(gr_linetype[get_linestyle(series)]) - GR.setlinewidth(max(0, get_linewidth(series) / (sum(gr_plot_size) * 0.001))) - if plot_color(series[:linecolor]) == [plot_color(:black)] - GR.contour(x, y, h, z, 0 + (series[:contour_labels] == true ? 1 : 0)) - else - GR.contour(x, y, h, z, 1000 + (series[:contour_labels] == true ? 1 : 0)) - end + coff = plot_color(series[:linecolor]) == [plot_color(:black)] ? 0 : 1000 + GR.contour(x, y, h, z, coff + (series[:contour_labels] == true ? 1 : 0)) end # create the colorbar of contour levels