From a2da52eb2b7d408ea65ba078b74a1d416ddcf2c0 Mon Sep 17 00:00:00 2001 From: Felix Cremer Date: Fri, 13 Oct 2023 16:34:06 +0200 Subject: [PATCH] Fix heatmap! function in Makie --- ext/DimensionalDataMakie.jl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ext/DimensionalDataMakie.jl b/ext/DimensionalDataMakie.jl index ebc27a608..809140975 100644 --- a/ext/DimensionalDataMakie.jl +++ b/ext/DimensionalDataMakie.jl @@ -89,7 +89,6 @@ function _pointbased1(A, attributes; set_axis_attributes=true) lookup_attributes, newdims = _split_attributes(A1) A2 = _restore_dim_names(set(A1, newdims[1] => newdims[1]), A) args = Makie.convert_arguments(Makie.PointBased(), A2) - # Plot attribute generation user_attributes = Makie.Attributes(; attributes...) axis_attributes = if set_axis_attributes @@ -107,7 +106,10 @@ function _pointbased1(A, attributes; set_axis_attributes=true) label=DD.label(A), ) merged_attributes = merge(user_attributes, axis_attributes, plot_attributes, lookup_attributes) - + #@show merged_attributes + if !set_axis_attributes + delete!(merged_attributes, :axis) + end return args, merged_attributes end @@ -153,7 +155,7 @@ for (f1, f2) in _paired(:plot => :heatmap, :heatmap, :image, :contour, :contourf x=nothing, y=nothing, colorbarkw=(;), attributes... ) replacements = _keywords2dimpairs(x, y) - args, _ = _surface2(A, attributes, replacements) + _, _, args, _ = _surface2(A, attributes, replacements) # No ColourBar in the ! in-place versions return Makie.$f2!(args...; attributes...) end