Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Uncertain #307

Merged
merged 55 commits into from
Jan 28, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
d4404ce
refactoring topo_series: Bene makes a first strike
vladdez Dec 19, 2024
ad3d5e6
all test passed
vladdez Dec 19, 2024
483482c
upd docstrings
vladdez Dec 19, 2024
7ee6f01
code reorganisation
vladdez Dec 20, 2024
8aa6157
joss
vladdez Jan 10, 2025
1b8c246
upd the title for joss
vladdez Jan 10, 2025
eccd4bb
citeation + issue 288 + horizontal colorbars
vladdez Jan 10, 2025
ce3d0be
solving horiz colorbar
vladdez Jan 13, 2025
429c344
applying Linrange for ticks in erpimage
vladdez Jan 13, 2025
f0cc079
workaround for 251
vladdez Jan 13, 2025
7c5f6ba
citation section upd
vladdez Jan 13, 2025
2af784d
version bump
vladdez Jan 14, 2025
e510344
ticks on x, y cand colorbar are corrected
vladdez Jan 14, 2025
a2c953a
Update src/plot_erpimage.jl
vladdez Jan 14, 2025
d43b92d
Update src/plot_erpimage.jl
vladdez Jan 14, 2025
8e7a15b
up Unfold and tests format
vladdez Jan 14, 2025
67d1008
bug in significance
vladdez Jan 14, 2025
b049a97
switch from colorrange to limits in toposeries in colorbar
vladdez Jan 14, 2025
f1af5e5
extracting cutting_management into separate function
vladdez Jan 14, 2025
e36bfc2
more lines into add function + rounding of lables
vladdez Jan 14, 2025
f43165d
comments
vladdez Dec 17, 2024
b4eeeb9
CompatHelper: bump compat for Makie to 0.22, (keep existing compat)
Jan 14, 2025
12b3436
Update src/plot_topoplotseries.jl
vladdez Jan 14, 2025
8890a94
bug
vladdez Jan 15, 2025
d57920e
solved jumping colorbar in plot_topoplot
vladdez Jan 15, 2025
6aa3c30
further lintering
vladdez Jan 15, 2025
a74154e
issue 223 workaround
vladdez Jan 15, 2025
8d2d89e
adding in docs info about uncertainty visualisation for toposeries
vladdez Jan 17, 2025
3ece7a9
bugs in docs
vladdez Jan 17, 2025
c54126d
gif added
vladdez Jan 17, 2025
54a6090
gif added 2
vladdez Jan 17, 2025
3b17c2b
bootstrapped animation
vladdez Jan 20, 2025
22c51fe
moved data generation into example_data
vladdez Jan 20, 2025
7a54ebd
explaining text
vladdez Jan 20, 2025
63577c7
noice twiggle
vladdez Jan 20, 2025
4b24181
bug
vladdez Jan 21, 2025
2e761bd
no contours
vladdez Jan 21, 2025
29d0ecd
adding Animations
vladdez Jan 21, 2025
0242fa5
just for ease of local testing
vladdez Jan 22, 2025
cb2ff76
update Makie Project and solve the bug
vladdez Jan 22, 2025
e2d0f3b
issue 223 finally solved
vladdez Jan 23, 2025
e8c1e5b
Update docs/literate/how_to/uncertain_topo.jl
vladdez Jan 24, 2025
383ef2e
Update docs/literate/intro/speed.jl
vladdez Jan 24, 2025
9482fea
comments: easy
vladdez Jan 24, 2025
3d0f053
correcting bootstrapping data and implementation of easing
vladdez Jan 24, 2025
1c3a26b
del Revise
vladdez Jan 24, 2025
0c6e5d0
bug
vladdez Jan 24, 2025
39463a7
Update src/plot_erp.jl
vladdez Jan 24, 2025
6da6c56
renaming xlables to topoplot_xlables
vladdez Jan 24, 2025
8be7019
bug
vladdez Jan 27, 2025
4830603
topolabels_rounding
vladdez Jan 27, 2025
6e2d1fa
colorrange is now adjustable in plot_erpplot
vladdez Jan 27, 2025
5538af6
after final revision
vladdez Jan 28, 2025
7890367
merge
vladdez Jan 28, 2025
ad3fc5f
bug
vladdez Jan 28, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/eeg_series.jl
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ function eeg_topoplot_series!(
)
# for performance, new variable name is necessary, as type might change
data = _as_observable(data_inp)

topo_axis = update_axis(supportive_defaults(:topo_default_series); topo_axis...)

# do the col/row plot
Expand Down Expand Up @@ -150,6 +151,7 @@ end
eeg_array_to_dataframe(data::AbstractMatrix, label_aliases::AbstractVector)
eeg_array_to_dataframe(data::AbstractVector, label_aliases::AbstractVector)
eeg_array_to_dataframe(data::Union{AbstractMatrix, AbstractVector{<:Number}})

Helper function converting an array (Matrix or Vector) to a tidy `DataFrame` with columns `:estimate`, `:time` and `:label` (with aliases `:color`, `:group`, `:channel`).

Format of Arrays:\\
Expand Down
2 changes: 1 addition & 1 deletion src/plot_erpimage.jl
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ function ei_meanplot(ax, data, config, f, ga, times, meanplot_axis)
trace = @lift(mean($data, dims = 2)[:, 1])
meanplot_axis = update_axis(supportive_defaults(:meanplot_default); meanplot_axis...)
xticks = @lift(round.(LinRange(minimum($times), maximum($times), 5), digits = 2))
yticks = @lift(round.(LinRange(minimum($trace), maximum($trace), 5), digits = 1))
yticks = @lift(round.(LinRange(minimum($trace), maximum($trace), 3), digits = 1))

axbottom = Axis(
ga[5, 1:4];
Expand Down
3 changes: 0 additions & 3 deletions test/test_toposeries2.jl
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ end

plot_topoplotseries(
df;
col_labels = true,
mapping = (; col = :condition),
positions = positions,
)
Comment on lines 69 to 73
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[JuliaFormatter] reported by reviewdog 🐶

Suggested change
plot_topoplotseries(
df;
col_labels = true,
mapping = (; col = :condition),
positions = positions,
)
plot_topoplotseries(df; mapping = (; col = :condition), positions = positions)

Expand Down Expand Up @@ -151,7 +150,6 @@ end
plot_topoplotseries!(
f[1, 1],
df_obs;
col_labels = true,
mapping = (; col = :condition),
positions = positions,
)
Expand All @@ -168,7 +166,6 @@ end
obs_tuple = Observable((0, 0, 0))
plot_topoplotseries(
df;
col_labels = true,
mapping = (; col = :condition),
positions = positions,
visual = (; label_scatter = (markersize = 15, strokewidth = 2)),
Expand Down
Loading