From e95ddc3ef8a4d96a65b1105136b587c013864047 Mon Sep 17 00:00:00 2001 From: Daniel Schwabeneder Date: Fri, 22 Jan 2021 18:05:40 +0100 Subject: [PATCH 1/2] fix defaults in spy recipe --- src/recipes.jl | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/recipes.jl b/src/recipes.jl index 49028953..246f7bb7 100644 --- a/src/recipes.jl +++ b/src/recipes.jl @@ -1522,12 +1522,8 @@ end rs, cs, zs = Plots.findnz(z.surf) xlims := ignorenan_extrema(cs) ylims := ignorenan_extrema(rs) - if plotattributes[:markershape] == :none - markershape := :circle - end - if plotattributes[:markersize] == default(:markersize) - markersize := 1 - end + markershape --> :circle + markersize --> 1 markerstrokewidth := 0 if length(unique(zs)) == 1 seriescolor --> :black @@ -1631,4 +1627,4 @@ julia> areaplot(1:3, [1 2 3; 7 8 9; 4 5 6], seriescolor = [:red :green :blue], f end end -@specialize \ No newline at end of file +@specialize From fa8d437836f4652af9d64ff5313501416fd15964 Mon Sep 17 00:00:00 2001 From: Daniel Schwabeneder Date: Fri, 22 Jan 2021 18:16:13 +0100 Subject: [PATCH 2/2] widen axis limits --- src/axes.jl | 2 +- src/recipes.jl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/axes.jl b/src/axes.jl index 37ea8eaa..cfd63b5d 100644 --- a/src/axes.jl +++ b/src/axes.jl @@ -853,4 +853,4 @@ end reverse_if(x, cond) = cond ? reverse(x) : x axis_tuple(x, y, letter) = reverse_if((x, y), letter === :y) -axes_shift(t, i) = i % 3 == 0 ? t : i % 3 == 1 ? (t[3], t[1], t[2]) : (t[2], t[3], t[1]) \ No newline at end of file +axes_shift(t, i) = i % 3 == 0 ? t : i % 3 == 1 ? (t[3], t[1], t[2]) : (t[2], t[3], t[1]) diff --git a/src/recipes.jl b/src/recipes.jl index 246f7bb7..46ef79a1 100644 --- a/src/recipes.jl +++ b/src/recipes.jl @@ -1520,8 +1520,8 @@ end yflip := true aspect_ratio := 1 rs, cs, zs = Plots.findnz(z.surf) - xlims := ignorenan_extrema(cs) - ylims := ignorenan_extrema(rs) + xlims := widen(ignorenan_extrema(cs)..., get(plotattributes, :xscale, :identity)) + ylims := widen(ignorenan_extrema(rs)..., get(plotattributes, :yscale, :identity)) markershape --> :circle markersize --> 1 markerstrokewidth := 0