resolve AoG conflict, fix doc page

vladdez · May 15, 2023 · b75d88a · b75d88a
1 parent 2312874
commit b75d88a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/docs/Project.toml b/docs/Project.toml
@@ -10,6 +10,7 @@ DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
 Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
 Glob = "c27321d9-0574-5035-807b-f59d2c89b15c"
 Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306"
+MakieThemes = "e296ed71-da82-5faf-88ab-0034a9761098"
 StatsModels = "3eaba693-59b7-5ba5-a881-562e759f1c8d"
 TopoPlots = "2bdbdf9c-dbd8-403f-947b-1a4e0dd41a7a"
 Unfold = "181c99d8-e21b-4ff3-b70b-c233eddec679"

diff --git a/docs/allfigs.png b/docs/allfigs.png
diff --git a/docs/example_data.jl b/docs/example_data.jl
@@ -11,11 +11,12 @@ function example_data(example="TopoPlots.jl")
 
 	if example == "UnfoldLinearModel"
 		# load and generate a simulated Unfold Design
-		data,evts = UnfoldSim.predef_eeg(;return_epoched=true)
+		data,evts = UnfoldSim.predef_eeg(;noiselevel=10,return_epoched=true)
+		data = reshape(data,1,size(data)...)
 		f  = @formula 0~1+condition+continuous
 		# generate ModelStruct
 		se_solver =(x,y)->Unfold.solver_default(x,y,stderror=true)
-		return fit(UnfoldModel,(Dict(Any=>(f,range(0,length=size(data,1),step=1/100)))) ,evts,data;solver=se_solver)
+		return fit(UnfoldModel,(Dict(Any=>(f,range(0,length=size(data,2),step=1/100)))) ,evts,data;solver=se_solver)
 	elseif example == "UnfoldLinearModelMultiChannel"
 			# load and generate a simulated Unfold Design
 			cAll = DataFrame()
@@ -40,6 +41,7 @@ function example_data(example="TopoPlots.jl")
 	elseif example == "UnfoldLinearModelContinuousTime"
 		# load and generate a simulated Unfold Design
 		data,evts = UnfoldSim.predef_eeg(;)
+		data = reshape(data,1,size(data)...)
 		f  = @formula 0~1+condition+continuous
 		basis = firbasis([0,0.5],100)
 		# generate ModelStruct

diff --git a/docs/src/how_to/mult_vis_in_fig.md b/docs/src/how_to/mult_vis_in_fig.md
@@ -6,13 +6,16 @@ using CairoMakie
 using DataFramesMeta
 using UnfoldSim
 using Unfold
+using MakieThemes
+set_theme!(theme_ggthemr(:flat)) # nicer defaults - should maybe be default?
 
 ```
 ```@example main
 include("../../example_data.jl")
 d_topo,positions = example_data("TopoPlots.jl")
 uf_deconv= example_data("UnfoldLinearModelContinuousTime")
 uf= example_data("UnfoldLinearModel")
+results = coeftable(uf)
 uf_5chan = example_data("UnfoldLinearModelMultiChannel")
 d_singletrial,_= UnfoldSim.predef_eeg(;return_epoched=true)
 ```

diff --git a/src/layout_helper.jl b/src/layout_helper.jl
@@ -28,7 +28,7 @@ function applyLayoutSettings!(config::PlotConfig; fig = nothing, hm = nothing,
     end
 
     if :hidespines ∈ keys(config.layout) && !isnothing(config.layout.hidespines)
-        hidespines!(ax, config.layout.hidespines...)
+        Makie.hidespines!(ax, config.layout.hidespines...)
     end
 
     if :hidedecorations ∈ keys(config.layout) && !isnothing(config.layout.hidedecorations)
@@ -44,7 +44,5 @@ function applyLayoutSettings!(config::PlotConfig; fig = nothing, hm = nothing,
     #end
 end
 Makie.hidedecorations!(ax::Matrix{AxisEntries};kwargs...) = Makie.hidedecorations!.(ax;kwargs...)
-Makie.hidedecorations!(ax::AxisEntries;kwargs...) = Makie.hidedecorations!.(ax.axis;kwargs...)
 Makie.hidespines!(ax::Matrix{AxisEntries},args...) = Makie.hidespines!.(ax,args...)
-Makie.hidespines!(ax::AxisEntries,args...) = Makie.hidespines!.(ax.axis,args...)
 #hidespinses!(ax:Axis,args...) = hiespines!.(Ref(ax),args...)