8plots (#97)

* Update plot_erp.jl * new tests, combined plot in docs * del * additional docs problems * little detail * dead links * docstring warnings * cross-refs again * test * pp_plot fixed * docs errors should be resolved * Update hide_deco.md * colorbar docs * liting * add Voltage label * linting + name consistency * formatter * no extra for circular * no extra toposeries * test for design matrix and no extra * test * no extra for erp * del extra in erpimage and parplot * g * citability * failed, but I will save it * fixed * fixed colorbar in toposeries * small test * review of current test * del chanNum argument * adding Gridlayout option * small fixes * add new argument to erp plot * colorbar section in configs for toposeries * whatever --------- Co-authored-by: behinger (s-ccs 001) <[email protected]>
unfoldtoolbox · Nov 13, 2023 · d9e56b5 · d9e56b5
1 parent cc42f28
commit d9e56b5
Show file tree

Hide file tree

Showing 19 changed files with 322 additions and 257 deletions.
diff --git a/docs/src/tutorials/topoplotseries.md b/docs/src/tutorials/topoplotseries.md
@@ -27,10 +27,10 @@ nothing #hide
 plot_topoplotseries(df, Δbin; positions = positions)
 ```
 
-With colorbar:
+Without colorbar:
 
 ```@example main
-plot_topoplotseries(df, Δbin; positions=positions, layout = (; useColorbar=true))
+plot_topoplotseries(df, Δbin; positions=positions, layout = (; useColorbar=false))
 ```
 
 ### Positions

diff --git a/src/eeg-series.jl b/src/eeg-series.jl
diff --git a/src/eeg_series.jl b/src/eeg_series.jl
@@ -166,7 +166,9 @@ function eeg_topoplot_series!(
             push!(axlist, ax)
         end
     end
-    colgap!(fig.layout, 0)
+    if typeof(fig) != GridLayout
+        colgap!(fig.layout, 0)
+    end
 
     return fig, axlist
 end

diff --git a/src/plot_circulareegtopoplot.jl b/src/plot_circulareegtopoplot.jl
@@ -1,11 +1,11 @@
 """
-    plot_circulareegtopoplot(plotData::DataFrame;kwargs...)
-    plot_circulareegtopoplot!(figlike, plotData::DataFrame;kwargs...)
+    plot_circulareegtopoplot(plotData::DataFrame; kwargs...)
+    plot_circulareegtopoplot!(figlike, plotData::DataFrame; kwargs...)
 
 Plot a circular EEG topoplot.
 ## Arguments:
 
-- `figlike::Union{GridPosition, Figure}`: Figure or GridPosition that the plot should be drawn into
+- `figlike::Union{GridPosition, GridLayout, Figure}`: Figure or GridPosition that the plot should be drawn into
 - `plotData::DataFrame`: Dataframe with keys for data (looks for `:y,:yhat, :estimate`, and :position (looks for `:pos, :positions, :position`), 
 - `predictor` (optional; default :predictor) the circular predictor value, defines position of topoplot, is mapped around `predictorBounds`
 - `predictorBounds`: Default: `[0,360]` - The bounds of the predictor. This is relevant for the axis labels.
@@ -29,7 +29,7 @@ plot_circulareegtopoplot(plotData::DataFrame; kwargs...) =
 plot_circulareegtopoplot!(f, plotData::DataFrame; kwargs...) =
     plot_circulareegtopoplot!(f, plotData; kwargs...)
 function plot_circulareegtopoplot!(
-    f::Union{GridPosition,Figure},
+    f::Union{GridPosition,GridLayout,Figure},
     plotData::DataFrame;
     predictor = :predictor,
     positions = nothing,

diff --git a/src/plot_designmatrix.jl b/src/plot_designmatrix.jl
@@ -1,9 +1,11 @@
 """ 
-    plot_designmatrix(plotData::Unfold.DesignMatrix;kwargs...)
+    plot_designmatrix!(f::Union{GridPosition, GridLayout, Figure}, plotData::Unfold.DesignMatrix; kwargs...)
+    plot_designmatrix(plotData::Unfold.DesignMatrix; kwargs...)
         
 
 Plot a designmatrix. 
 ## Arguments:
+- `f::Union{GridPosition, GridLayout, Figure}`: Figure or GridPosition (e.g. f[2, 3]) that the plot should be drawn into. New axis is created.
 - `plotData::Unfold.DesignMatrix`: Data for the plot visualization.
 
 ## kwargs
@@ -27,7 +29,7 @@ A figure displaying the designmatrix.
 plot_designmatrix(plotData::Unfold.DesignMatrix; kwargs...) =
     plot_designmatrix!(Figure(), plotData; kwargs...)
 function plot_designmatrix!(
-    f::Union{GridPosition,Figure},
+    f::Union{GridPosition,GridLayout,Figure},
     plotData::Unfold.DesignMatrix;
     xTicks = nothing,
     sortData = false,

diff --git a/src/plot_erp.jl b/src/plot_erp.jl
@@ -2,14 +2,14 @@ using DataFrames
 using TopoPlots
 using LinearAlgebra
 """
-    plot_erp!(f::Union{GridPosition, Figure}, plotData::DataFrame; kwargs...)
+    plot_erp!(f::Union{GridPosition, GridLayout, Figure}, plotData::DataFrame; kwargs...)
     plot_erp(plotData::DataFrame; kwargs...)
         
 Plot an ERP plot.
 
 ## 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`: Data for the line plot visualization.
 - `kwargs...`: Additional styling behavior. Often used: `plot_erp(df; mapping=(; color=:coefname, col=:conditionA))`
 
@@ -47,23 +47,26 @@ see also [`plot_erp`](@Ref)
 plot_butterfly(plotData::DataFrame; kwargs...) =
     plot_butterfly!(Figure(), plotData; kwargs...)
 
-plot_butterfly!(f::Union{GridPosition,<:Figure}, plotData::DataFrame; kwargs...) =
-    plot_erp!(
-        f,
-        plotData;
-        butterfly = true,
-        topoLegend = true,
-        topomarkersize = 10,
-        topowidth = 0.25,
-        topoheigth = 0.25,
-        topoPositionToColorFunction = x -> posToColorRomaO(x),
-        kwargs...,
-    )
+plot_butterfly!(
+    f::Union{GridPosition,GridLayout,<:Figure},
+    plotData::DataFrame;
+    kwargs...,
+) = plot_erp!(
+    f,
+    plotData;
+    butterfly = true,
+    topoLegend = true,
+    topomarkersize = 10,
+    topowidth = 0.25,
+    topoheigth = 0.25,
+    topoPositionToColorFunction = x -> posToColorRomaO(x),
+    kwargs...,
+)
 
 
 
 function plot_erp!(
-    f::Union{GridPosition,Figure},
+    f::Union{GridPosition,GridLayout,Figure},
     plotData::DataFrame;
     positions = nothing,
     labels = nothing,
@@ -86,7 +89,6 @@ function plot_erp!(
         config_kwargs!(config; kwargs...)
     end
 
-
     plotData = deepcopy(plotData) # XXX why?
 
     # resolve columns with data
@@ -184,7 +186,12 @@ function plot_erp!(
                 valign = 0.95,
                 aspect = 1,
             )
-            topoplotLegend(topoAxis, topomarkersize, topoPositionToColorFunction, allPositions)
+            topoplotLegend(
+                topoAxis,
+                topomarkersize,
+                topoPositionToColorFunction,
+                allPositions,
+            )
         end
         # no extra legend
         mainAxis = Axis(f_grid; config.axis...)
@@ -203,8 +210,6 @@ function plot_erp!(
 
     end
     applyLayoutSettings!(config; fig = f, ax = drawing, drawing = drawing)#, drawing = drawing)
-
-
     return f
 
 end
@@ -215,22 +220,10 @@ function eegHeadMatrix(positions, center, radius)
     oldRadius, _ = findmax(x -> norm(x .- oldCenter), positions)
     radF = radius / oldRadius
     return Makie.Mat4f(
-        radF,
-        0,
-        0,
-        0,
-        0,
-        radF,
-        0,
-        0,
-        0,
-        0,
-        1,
-        0,
+        radF, 0, 0, 0, 0,
+        radF, 0, 0, 0, 0, 1, 0,
         center[1] - oldCenter[1] * radF,
-        center[2] - oldCenter[2] * radF,
-        0,
-        1,
+        center[2] - oldCenter[2] * radF, 0, 1,
     )
 end
 

diff --git a/src/plot_erpgrid.jl b/src/plot_erpgrid.jl
@@ -1,10 +1,10 @@
 """
-    function plot_erpgrid!(f::Union{GridPosition, Figure}, data::Matrix{<:Real}, pos::Vector{Point{2,Float}}; kwargs...)
+    function plot_erpgrid!(f::Union{GridPosition, GridLayout, Figure}, data::Matrix{<:Real}, pos::Vector{Point{2,Float}}; kwargs...)
     function plot_erpgrid(data::Matrix{<:Real}, pos::Vector{Point{2,Float}}; kwargs...)
 
 Plot an ERP image.
 ## 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::Matrix{<:Real}`: Data for the plot visualization;
 - `pos::Vector{Point{2,Float}}`: electrode positions.
         
@@ -21,15 +21,14 @@ plot_erpgrid(plotData::Matrix{<:Real}, pos; kwargs...) =
     plot_erpgrid!(Figure(), plotData, pos; kwargs...)
 
 function plot_erpgrid!(
-    f::Union{GridPosition,Figure},
+    f::Union{GridPosition,GridLayout,Figure},
     plotData::Matrix{<:Real},
     pos;
     drawLabels = false,
     times = -1:size(plotData, 2)-2, #arbitrary strat just for fun
     kwargs...,
 )
     chanNum = size(plotData, 1)
-    println(size(plotData, 1), " ", size(plotData, 2))
     plotData = plotData[1:chanNum, :]
     pos = hcat([[p[1], p[2]] for p in pos]...)