From 71faca8348bb20f58742d021fe123c2103ade6cc Mon Sep 17 00:00:00 2001 From: Vladimir Mikheev <33777074+vladdez@users.noreply.github.com> Date: Mon, 13 Nov 2023 21:01:29 +0100 Subject: [PATCH] Update plot_topoplotseries.jl (#98) * Update plot_topoplotseries.jl code patches accidently deleted during git merge - extension of attributes for colorbar * Update test_all.jl change in tests --- src/plot_topoplotseries.jl | 18 ++++++++++-------- test/test_all.jl | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/plot_topoplotseries.jl b/src/plot_topoplotseries.jl index 6248525da..2758f05e6 100644 --- a/src/plot_topoplotseries.jl +++ b/src/plot_topoplotseries.jl @@ -1,12 +1,12 @@ """ - plot_topoplotseries!(f::Union{GridPosition, Figure}, plotData::DataFrame, Δbin::Real; kwargs...) + plot_topoplotseries!(f::Union{GridPosition, GridLayout, Figure}, plotData::DataFrame, Δbin::Real; kwargs...) plot_topoplotseries!(plotData::DataFrame, Δbin::Real; kwargs...) Multiple miniature topoplots in regular distances ## Arguments: -- `f::Union{GridPosition, Figure}`: Figure or GridPosition that the plot should be drawn into +- `f::Union{GridPosition, GridLayout, Figure}`: Figure or GridPosition that the plot should be drawn into - `plotData::DataFrame`: DataFrame with data, needs a `time` column - `Δbin::Real`: A number for how large one bin should be. Δbin is in units of the `plotData.time` column - `combinefun` (default `mean`) can be used to specify how the samples within `Δbin` are combined. @@ -75,9 +75,10 @@ function plot_topoplotseries!( f[1, end+1], colormap = d.colormap, colorrange = d.colorrange, - height = 100, - flipaxis = false, - label = "Voltage [µV]", + height = config.colorbar.height, + flipaxis = config.colorbar.flipaxis, + labelrotation = config.colorbar.labelrotation, + label = config.colorbar.label, ) else # println(fieldnames(typeof((axlist[1])))) @@ -86,9 +87,10 @@ function plot_topoplotseries!( f[:, :][1, length(axlist)+1], colormap = d.colormap, colorrange = d.colorrange, - height = 100, - flipaxis = false, - label = "Voltage [µV]", + height = config.colorbar.height, + flipaxis = config.colorbar.flipaxis, + labelrotation = config.colorbar.labelrotation, + label = config.colorbar.label, ) end end diff --git a/test/test_all.jl b/test/test_all.jl index 2e622a893..42e5637f0 100644 --- a/test/test_all.jl +++ b/test/test_all.jl @@ -84,7 +84,7 @@ end plot_topoplot!(f[2, 1], data[:, 150, 1]; positions=positions, t=150) plot_topoplotseries!(f[2, 2], d_topo, 0.1; positions=positions, layout = (; useColorbar=true)) - plot_erpgrid!(f[3, 1], data, pos) + plot_erpgrid!(f[3, 1], data[:, :, 1], positions) times = -0.099609375:0.001953125:1.0