upd gen_data: more variability across channels

Author: vladdez

docs/gen_data.jl

@@ -1,8 +1,19 @@
 using UnfoldSim, DataFrames, Random
 using GeometryBasics
-function gen_data()
+function gen_data(n_channels = 64)
     d1, evts = UnfoldSim.predef_eeg(n_repeats = 120, noiselevel = 25; return_epoched = true)
-    dataS = permutedims(repeat(d1, 1, 1, 64), (3, 1, 2))
+    n_timepoints = size(d1, 1)
+
+    # Generate distinct EEG signals per channel
+    dataS = [ 
+        d1 .+                                             # Keep ERP amplitude the same
+        3 * sin.(0.1 * pi * i .+ rand() * 2π) .+          # Different slow oscillatory drift
+        2 * sin.(0.3 * pi * i .* (1:n_timepoints)) .+     # Mid-frequency variation per channel
+        randn(size(d1)) .* 5 .+                           # Add fine-grained channel-specific noise
+        circshift(d1, rand(-10:10)) .* 0.2                # Random small time shift for variation
+        for i in 1:n_channels
+    ]
+    dataS = permutedims(cat(dataS..., dims=3), (3, 1, 2))
     dataS = dataS .+ rand(dataS)
 
     evts = insertcols(

src/functions_formular.jl

@@ -55,13 +55,13 @@ function formular_widgets(variables)
 end
 
 """
-    get_ERP_data(model, widget_signal, channel)
+    get_ERP_data(model, formula_toggle, channel_chosen)
 Creates a dictionary with yhat values and more.\\
 
 Arguments:\\
 - `model::UnfoldLinearModel{Float64}` - vector of key-value pairs with information about the model formula terms.\\
-- `widget_signal::Observable{Vector{Any}}` - a signal that emits a dictionary with the current values of the widgets.\\
-- `channel::Observable{Int64}` - number of selected channels.\\
+- `formula_toggle::Observable{Vector{Any}}` - a signal that emits a dictionary with the current values of the widgets.\\
+- `channel_chosen::Observable{Int64}` - number of selected channels.\\
 
 Actions:\\
 - Compute predicted value (yhat) of the given model using `effects`.\\
@@ -70,28 +70,27 @@ Actions:\\
 
 **Return Value:** `yhats_signal::Observable{Any}` containing DataFrame with yhats. 
 """
-function get_ERP_data(model, widget_signal, channel)
+function get_ERP_data(model, formula_toggle, channel_chosen)
+    ERP_data = Observable{Any}(nothing; ignore_equal_values = true)
 
-    yhats_signal = Observable{Any}(nothing; ignore_equal_values = true)
-
-    onany(widget_signal, channel; update = true) do widget_values, chan
+    onany(formula_toggle, channel_chosen; update = true) do widget_values, chan
         yhat_dict = Dict(
             k => widget_value(wv[2]) for (k, wv) in widget_values if !isempty(wv) && wv[1]
         )
         if isempty(yhat_dict)
             yhat_dict = Dict(:dummy => ["dummy"])
         end
         yhats = effects(yhat_dict, model)
+    
 
         for (k, wv) in widget_values
             if isempty(wv[2]) || !wv[1]
                 yhats[!, k] .= "typical_value"
             end
         end
-
         filter!(x -> x.channel == chan, yhats)
-        yhats_signal[] = yhats
+        ERP_data[] = yhats
     end
 
-    return yhats_signal
+    return ERP_data
 end

src/widgets_long.jl

@@ -85,15 +85,14 @@ Actions:\\
 function topoplot_widget(positions, channel_chosen; size = ())
     strokecolor = Observable(repeat([:red], length(to_value(positions)))) # crashing
     #channel_chosen = Observable(1)
-
     colorrange = vcat(0, 1)
     colormap = vcat(Gray(0.5), Gray(1))
 
-    data_obs = Observable(zeros(length(to_value(positions))))
-    data_obs.val[1] = 1
+    marker_list = Observable(zeros(length(to_value(positions))))
+    marker_list.val[1] = 1
 
     topo_widget = eeg_topoplot(
-        data_obs,
+        marker_list,
         nothing;
         positions = positions,
         colorrange = colorrange,
@@ -108,12 +107,11 @@ function topoplot_widget(positions, channel_chosen; size = ())
         if event.button == Mouse.left && event.action == Mouse.press
             plt, p = pick(topo_widget)
             if isa(plt, Makie.Scatter)
-                data_obs[] .= 0
-                data_obs[][p] = 1
-                notify(data_obs)
+                marker_list[] .= 0
+                marker_list[][p] = 1
+                notify(marker_list)
                 channel_chosen[] = p
             end
-
         end
     end
     hidedecorations!(topo_widget.axis)