Skip to content

nuke surface! overrides and use correct dimensional arrays. #894

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
asinghvi17 wants to merge 1 commit into from
Closed

nuke surface! overrides and use correct dimensional arrays. #894

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 2 additions & 18 deletions ext/DimensionalDataMakie.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,14 +154,14 @@ for (f1, f2) in _paired(:plot => :heatmap, :heatmap, :image, :contour, :contourf
haskey(axis_kw, :scenekw) && (lscene_attrs[:scenekw] = axis_kw[:scenekw])
haskey(axis_kw, :show_axis) && (lscene_attrs[:show_axis] = axis_kw[:show_axis])
# surface is an LScene so we cant pass some axis attributes
p = Makie.$f2(args...; figure = figure_kw, axis = lscene_attrs, merged_attributes...)
p = Makie.$f2(A2; figure = figure_kw, axis = lscene_attrs, merged_attributes...)
# And instead set axisnames manually
if p.axis isa Makie.LScene && !isnothing(p.axis.scene[Makie.OldAxis])
p.axis.scene[Makie.OldAxis][:names, :axisnames] = map(DD.label, DD.dims(A2))
end
p
else # axis_type isa Nothing, axis_type isa Makie.Axis or GeoAxis or similar
Makie.$f2(args...; axis = axis_kw, figure = figure_kw, merged_attributes...)
Makie.$f2(A2; axis = axis_kw, figure = figure_kw, merged_attributes...)
end
# Add a Colorbar for heatmaps and contourf
# TODO: why not surface too?
Expand All @@ -173,22 +173,6 @@ for (f1, f2) in _paired(:plot => :heatmap, :heatmap, :image, :contour, :contourf
p
return p
end
function Makie.$f1!(ax, A::AbstractDimMatrix;
x=nothing, y=nothing, colorbarkw=(;), attributes...
)
replacements = _keywords2dimpairs(x, y)
_, _, args, _ = _surface2(A, $f2, attributes, replacements)
# No Colorbar in the ! in-place versions
return Makie.$f2!(ax, args...; attributes...)
end
function Makie.$f1!(axis, A::Observable{<:AbstractDimMatrix};
x=nothing, y=nothing, colorbarkw=(;), attributes...
)
replacements = _keywords2dimpairs(x,y)
args = lift(x->_surface2(x, $f2, attributes, replacements)[3], A)
p = Makie.$f2!(axis, lift(x->x[1], args),lift(x->x[2], args),lift(x->x[3], args); attributes...)
return p
end
end
end

Expand Down