bug in toposeries (#57)

* toposeries bug
unfoldtoolbox · Aug 3, 2023 · e18b5f9 · e18b5f9
1 parent 27dc7fd
commit e18b5f9
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 15 deletions.
diff --git a/src/plot_topoplotseries.jl b/src/plot_topoplotseries.jl
@@ -20,31 +20,35 @@ Plot a Topoplot Series.
 The input `f`
 
 """
-plot_topoplotseries(plotData::DataFrame,Δbin::Real;kwargs...) = plot_topoplotseries!(Figure(), plotData, Δbin; kwargs...)
+plot_topoplotseries(plotData::DataFrame, Δbin::Real; kwargs...) = plot_topoplotseries!(Figure(), plotData, Δbin; kwargs...)
 
 
-function plot_topoplotseries!(f::Union{GridPosition, Figure}, plotData::DataFrame, Δbin; positions=nothing, labels=nothing, kwargs...)
+function plot_topoplotseries!(f::Union{GridPosition,Figure}, plotData::DataFrame, Δbin; positions=nothing, labels=nothing, kwargs...)
     config = PlotConfig(:topoplotseries)
-    config_kwargs!(config;kwargs...)
-    
+    config_kwargs!(config; kwargs...)
+
     plotData = deepcopy(plotData)
 
     # resolve columns with data
     config.mapping = resolveMappings(plotData, config.mapping)
 
-    positions = getTopoPositions(;positions=positions, labels=label)
+    positions = getTopoPositions(; positions=positions, labels=labels)
+
 
+    if "label" ∉ names(plotData)
+        plotData.label = plotData.channel
+    end
 
     eeg_topoplot_series!(f, plotData, Δbin;
-        col_y = config.mapping.y,
+        col_y=config.mapping.y,
         col_label=:label,
-        col = config.mapping.col,
-        row = config.mapping.row,
-        combinefun = config.extra.combinefun,
+        col=config.mapping.col,
+        row=config.mapping.row,
+        combinefun=config.extra.combinefun,
         positions=positions,
         config.visual...
-        )
+    )
 
     return f
-    
+
 end
diff --git a/test/Project.toml b/test/Project.toml
@@ -3,3 +3,4 @@ CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
 DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
 GeometryBasics = "5c1252a2-5f33-56bf-86c9-59e7332b4326"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+TopoPlots = "2bdbdf9c-dbd8-403f-947b-1a4e0dd41a7a"
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -4,4 +4,8 @@ include("setup.jl")
 
 @testset "UnfoldMakie.jl" begin
     include("test_plot_circulareegtopoplot.jl")
+end
+
+@testset "UnfoldMakie.jl" begin
+    include("test_toposeries.jl")
 end
diff --git a/test/setup.jl b/test/setup.jl
@@ -1,5 +1,6 @@
+using UnfoldMakie
 using Test
 using CairoMakie
 using GeometryBasics
 using DataFrames
-using UnfoldMakie
+using TopoPlots
diff --git a/test/test_plot_circulareegtopoplot.jl b/test/test_plot_circulareegtopoplot.jl
@@ -1,3 +1,5 @@
+#include("setup.jl")
+
 @testset "error cases and warns" begin
 
     @testset "out of error bounds" begin
@@ -12,12 +14,11 @@
 
     @testset "tooManyBoundsErr" begin
         testdf = DataFrame(
-            effect = [[4.0,1.0],[4.0,3.0],[4.0,3.0]],
+            estimate = [[4.0,1.0],[4.0,3.0],[4.0,3.0]],
             predictor = [70,80,90],
             )
 
-            @test_throws ErrorException plot_circulareegtopoplot(testdf;   extra=(;predictorBounds=[0,100,360]),          positions = [Point(1.0,2.0), Point(1.0,2.0), Point(1.0,2.0)],
-            )
+            @test_throws ErrorException plot_circulareegtopoplot(testdf;   extra=(;predictorBounds=[0,100,360]),          positions = [Point(1.0,2.0), Point(1.0,2.0), Point(1.0,2.0)],)
 
     end
 end

diff --git a/test/test_toposeries.jl b/test/test_toposeries.jl
@@ -0,0 +1,9 @@
+# include("../UnfoldMakie/test/test_toposeries.jl")
+#include("setup.jl")
+@testset "testing calculateBBox" begin
+    data, positions = TopoPlots.example_data()
+    df = UnfoldMakie.eeg_matrix_to_dataframe(data[:, :, 1], string.(1:length(positions)));
+    Δbin=80
+    UnfoldMakie.plot_topoplotseries(df, Δbin; positions=positions)
+
+end