Skip to content

Develop v0.9#151

Open
craddm wants to merge 42 commits intomainfrom
develop
Open

Develop v0.9#151
craddm wants to merge 42 commits intomainfrom
develop

Conversation

@craddm
Copy link
Owner

@craddm craddm commented Feb 10, 2026

Just a first pass at a new development branch with updates for 2026.

  • added convex hull option to topoplot

Merge remote-tracking branch 'origin/main' into develop

# Conflicts:
#	DESCRIPTION
#	R/utils.R
#	man/conv_to_mat.Rd
#	man/geom_topo.Rd
#	tests/testthat/_snaps/ICA/timecourse-over-one-component.svg
#	tests/testthat/_snaps/ICA/topographical-plot-for-fastica.svg
#	tests/testthat/_snaps/ICA/topographical-plot-for-fica.svg
#	tests/testthat/_snaps/ICA/topographical-plot-for-sobi.svg
#	tests/testthat/_snaps/ICA/topoplot-multiple-comps.svg
#	tests/testthat/_snaps/plotting_funs/erp-scalp-plot-from-demo-spatial.svg
#	tests/testthat/_snaps/plotting_funs/erp-scalp-plot-with-colour.svg
#	tests/testthat/_snaps/signal_decomposition/topographical-plot-for-ssd.svg
#	tests/testthat/_snaps/topoplot/add-custom-fill-title.svg
#	tests/testthat/_snaps/topoplot/au-label-for-ica.svg
#	tests/testthat/_snaps/topoplot/gam-topo.svg
#	tests/testthat/_snaps/topoplot/head-limit.svg
#	tests/testthat/_snaps/topoplot/multiple-times.svg
#	tests/testthat/_snaps/topoplot/topoplot-of-epochs-150-200ms.svg
#	tests/testthat/_snaps/topoplot/topoplot-of-epochs.svg
Merge branch 'develop' into exploring-speedups

# Conflicts:
#	.github/workflows/test-coverage.yaml
#	DESCRIPTION
#	tests/testthat/_snaps/ICA/fastica-timecourse.svg
#	tests/testthat/_snaps/ICA/reconstruct-all.svg
#	tests/testthat/_snaps/ICA/removed-one-component.svg
#	tests/testthat/_snaps/ICA/timecourse-over-one-component.svg
#	tests/testthat/_snaps/ICA/topographical-plot-for-fastica.svg
#	tests/testthat/_snaps/ICA/topographical-plot-for-fica.svg
#	tests/testthat/_snaps/ICA/topographical-plot-for-sobi.svg
#	tests/testthat/_snaps/epoch_images/erp-image-a29-from-demo-epochs.svg
#	tests/testthat/_snaps/epoch_images/erp-image-comp001-from-demo-epochs.svg
#	tests/testthat/_snaps/epoch_images/erp-raster-with-facets.svg
#	tests/testthat/_snaps/epoch_images/erp-raster-without-anat-order.svg
#	tests/testthat/_snaps/frequency_analysis/hanning-tfr-log-spaced-plot.svg
#	tests/testthat/_snaps/frequency_analysis/hanning-tfr-plot.svg
#	tests/testthat/_snaps/frequency_analysis/untrimmed-edges.svg
#	tests/testthat/_snaps/frequency_plotting/db.svg
#	tests/testthat/_snaps/frequency_plotting/ratio.svg
#	tests/testthat/_snaps/frequency_plotting/tfa-plot-for-demo-epochs-fourier.svg
#	tests/testthat/_snaps/frequency_plotting/tfa-plot-for-demo-epochs.svg
#	tests/testthat/_snaps/frequency_plotting/timecourses-from-eeg-tfr-with-baseline.svg
#	tests/testthat/_snaps/frequency_plotting/timecourses-from-eeg-tfr-with-freq-range.svg
#	tests/testthat/_snaps/frequency_plotting/timecourses-from-eeg-tfr-with-time-lim.svg
#	tests/testthat/_snaps/frequency_plotting/timecourses-from-eeg-tfr.svg
#	tests/testthat/_snaps/ggplot/geom-statscalp-head.svg
#	tests/testthat/_snaps/plot_gfp/gfp-for-demo-spatial-with-colours.svg
#	tests/testthat/_snaps/plot_gfp/gfp-for-demo-spatial-with-trials-kept.svg
#	tests/testthat/_snaps/plot_gfp/gfp-for-demo-spatial.svg
#	tests/testthat/_snaps/plotting_funs/a29-baseline-corr-epochs.svg
#	tests/testthat/_snaps/plotting_funs/a29-only-epochs.svg
#	tests/testthat/_snaps/plotting_funs/butterfly-epochs-baseline.svg
#	tests/testthat/_snaps/plotting_funs/butterfly-epochs.svg
#	tests/testthat/_snaps/plotting_funs/butterfly-evoked.svg
#	tests/testthat/_snaps/plotting_funs/epochs-plot.svg
#	tests/testthat/_snaps/plotting_funs/erp-scalp-plot-from-demo-spatial.svg
#	tests/testthat/_snaps/plotting_funs/erp-scalp-plot-with-colour.svg
#	tests/testthat/_snaps/plotting_funs/plot-timecourse-of-component.svg
#	tests/testthat/_snaps/plotting_funs/plot-timecourse-of-evoked.svg
#	tests/testthat/_snaps/plotting_funs/plot-timecourse-of-tfr-in-db-at-specific-freq-range.svg
#	tests/testthat/_snaps/plotting_funs/plot-timecourse-of-tfr-in-db.svg
#	tests/testthat/_snaps/plotting_funs/plot-timecourse-of-tfr.svg
#	tests/testthat/_snaps/plotting_funs/spatial-difference-plot.svg
#	tests/testthat/_snaps/plotting_funs/spatial-ga-plot-colour.svg
#	tests/testthat/_snaps/plotting_funs/spatial-ga-plot-facetted.svg
#	tests/testthat/_snaps/plotting_funs/spatial-ga-plot-mapping.svg
#	tests/testthat/_snaps/plotting_funs/spatial-ga-plot.svg
#	tests/testthat/_snaps/signal_decomposition/topographical-plot-for-ssd.svg
#	tests/testthat/_snaps/topoplot/add-custom-fill-title.svg
#	tests/testthat/_snaps/topoplot/au-label-for-ica.svg
#	tests/testthat/_snaps/topoplot/gam-topo.svg
#	tests/testthat/_snaps/topoplot/head-limit.svg
#	tests/testthat/_snaps/topoplot/multiple-times.svg
#	tests/testthat/_snaps/topoplot/topoplot-of-epochs-150-200ms.svg
#	tests/testthat/_snaps/topoplot/topoplot-of-epochs.svg
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant