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

Develop #267

Merged
merged 47 commits into from
Jun 21, 2024
Merged

Develop #267

merged 47 commits into from
Jun 21, 2024

Commits on Jun 2, 2022

  1. example test commit (#182)

    * example test commit
    
    * example edit
    JohnGriffiths authored Jun 2, 2022
    Configuration menu
    Copy the full SHA
    6579d6c View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2022

  1. Configuration menu
    Copy the full SHA
    ae4a5db View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2022

  1. Configuration menu
    Copy the full SHA
    5c83bbe View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    32515fa View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    75e42ef View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f139ab5 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2022

  1. Experiment Class Refactor (update to #183), converting specific exper…

    …iments to subclasses (#184)
    
    * First commit
    
    * Second commit
    
    * Modifications
    
    * Lol
    
    * Lol
    
    * Incorporated N170 and p300, looking good for a PR
    
    * ssvep update
    
    * Implementing subclasses instead of loose functions
    
    * fix: fixed import (brainflow updated API)
    
    * Playing around still
    
    * Fixing import errors
    
    * Adding abstractmethod decorators
    
    * Still working on the import error
    
    * Guess what's finally working
    
    * Comments and naming ticks
    
    * More comments
    
    * Live coding demonstration
    
    * ssvep adapted
    
    * Adapting Auditory Oddball
    
    * changing save_fn to self.save_fun
    
    * This maybe the last big change
    
    * utils file changed, changes work through cli
    
    Co-authored-by: Erik Bjäreholt <erik@bjareho.lt>
    Parvfect and ErikBjare authored Aug 10, 2022
    Configuration menu
    Copy the full SHA
    e4e7d8a View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2022

  1. Submodule added for gsoc

    Parvfect committed Sep 5, 2022
    Configuration menu
    Copy the full SHA
    05bdf62 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    368afa3 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2022

  1. Adding pipelines for cli analysis (#202)

    * started pipelines function
    
    * almost working simple function equivalents of nb scripts
    
    * fix: fixed import (brainflow updated API)
    
    * sqc fixes for unicorn (#176)
    
    * Ignore pushes
    
    * Trying to create a cli
    
    * Stepping through the problem
    
    * First commit
    
    * Fixing pause in signal quality check
    
    * Fixing Signal quality check problem
    
    * fix the technical debt
    
    * Save path done for automated saving pdf
    
    * I feel amazing
    
    * Almost through
    
    * Update eegnb/cli/__main__.py
    
    Co-authored-by: Erik Bjäreholt <erik@bjareho.lt>
    
    * Trying to create cli but it's being really painful
    
    * Extra word cli error
    
    * Changed example handling
    
    * Pain
    
    * Adding whole datapath
    
    * Finally fixed cli
    
    * hmm
    
    * Looking good
    
    * added hyperlink
    
    * Having some issues with detecting css and image deltetion
    
    * Just the css now
    
    * Fixed the css linking problem though it's a weird soln
    
    * Automated running, still fnames problem
    
    * Hahahah embedded images in html
    
    * Improving code
    
    * Okay now
    
    * Look at that
    
    * Almost there just the two figures now
    
    * Now
    
    * Added attrdict to do with cli error
    
    Co-authored-by: John Griffiths <j.davidgriffiths@gmail.com>
    Co-authored-by: Erik Bjäreholt <erik@bjareho.lt>
    Co-authored-by: John Griffiths <JohnGriffiths@users.noreply.github.com>
    4 people authored Oct 16, 2022
    Configuration menu
    Copy the full SHA
    6714740 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3f3281c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    79652af View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2022

  1. Configuration menu
    Copy the full SHA
    a62280a View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2022

  1. run exp fix

    JohnGriffiths committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    e7bee1b View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2022

  1. Configuration menu
    Copy the full SHA
    e6e92b9 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2022

  1. fixes to get docs building by github action (#210)

    * fixes to get docs building by github action
    
    * reverted some changes
    
    * Update 01r__ssvep_viz.py
    
    Co-authored-by: John Griffiths <JohnGriffiths@users.noreply.github.com>
    pellet and JohnGriffiths authored Oct 27, 2022
    Configuration menu
    Copy the full SHA
    30fb77c View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2022

  1. Update README.rst

    small commit to test doc build workflow on this branch
    JohnGriffiths authored Dec 1, 2022
    Configuration menu
    Copy the full SHA
    6783463 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2023

  1. removing gsoc submodule

    JohnGriffiths committed Jan 19, 2023
    Configuration menu
    Copy the full SHA
    3b1585f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8f41ebe View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2023

  1. Configuration menu
    Copy the full SHA
    478fa49 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3bd12a7 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a4fe823 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c2c5d57 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    adf5e28 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2023

  1. update dependencies - for build (#220)

    * major update: merging develop to master (#217)
    
    * example test commit (#182)
    
    * example test commit
    
    * example edit
    
    * ci: run test workflow on develop branch
    
    * ci: add develop branch to job triggers
    
    * ci: fix syntax issue in workflow
    
    * fix: fixed import (brainflow updated API)
    
    * build(deps): locked pylsl==1.10.5 (#187)
    
    * Experiment Class Refactor (update to #183), converting specific experiments to subclasses (#184)
    
    * First commit
    
    * Second commit
    
    * Modifications
    
    * Lol
    
    * Lol
    
    * Incorporated N170 and p300, looking good for a PR
    
    * ssvep update
    
    * Implementing subclasses instead of loose functions
    
    * fix: fixed import (brainflow updated API)
    
    * Playing around still
    
    * Fixing import errors
    
    * Adding abstractmethod decorators
    
    * Still working on the import error
    
    * Guess what's finally working
    
    * Comments and naming ticks
    
    * More comments
    
    * Live coding demonstration
    
    * ssvep adapted
    
    * Adapting Auditory Oddball
    
    * changing save_fn to self.save_fun
    
    * This maybe the last big change
    
    * utils file changed, changes work through cli
    
    Co-authored-by: Erik Bjäreholt <erik@bjareho.lt>
    
    * Submodule added for gsoc
    
    * Adding pipelines for cli analysis (#202)
    
    * started pipelines function
    
    * almost working simple function equivalents of nb scripts
    
    * fix: fixed import (brainflow updated API)
    
    * sqc fixes for unicorn (#176)
    
    * Ignore pushes
    
    * Trying to create a cli
    
    * Stepping through the problem
    
    * First commit
    
    * Fixing pause in signal quality check
    
    * Fixing Signal quality check problem
    
    * fix the technical debt
    
    * Save path done for automated saving pdf
    
    * I feel amazing
    
    * Almost through
    
    * Update eegnb/cli/__main__.py
    
    Co-authored-by: Erik Bjäreholt <erik@bjareho.lt>
    
    * Trying to create cli but it's being really painful
    
    * Extra word cli error
    
    * Changed example handling
    
    * Pain
    
    * Adding whole datapath
    
    * Finally fixed cli
    
    * hmm
    
    * Looking good
    
    * added hyperlink
    
    * Having some issues with detecting css and image deltetion
    
    * Just the css now
    
    * Fixed the css linking problem though it's a weird soln
    
    * Automated running, still fnames problem
    
    * Hahahah embedded images in html
    
    * Improving code
    
    * Okay now
    
    * Look at that
    
    * Almost there just the two figures now
    
    * Now
    
    * Added attrdict to do with cli error
    
    Co-authored-by: John Griffiths <j.davidgriffiths@gmail.com>
    Co-authored-by: Erik Bjäreholt <erik@bjareho.lt>
    Co-authored-by: John Griffiths <JohnGriffiths@users.noreply.github.com>
    
    * added more options for site args; improved function names; removed some redundant lines (#209)
    
    * fix subject num parsing bug
    
    * analysis report function improvements for openbci cyton and gtec unicorn devices
    
    * run exp fix
    
    * Update requirements.txt
    
    * fixes to get docs building by github action (#210)
    
    * fixes to get docs building by github action
    
    * reverted some changes
    
    * Update 01r__ssvep_viz.py
    
    Co-authored-by: John Griffiths <JohnGriffiths@users.noreply.github.com>
    
    * Update README.rst
    
    small commit to test doc build workflow on this branch
    
    * removing gsoc submodule
    
    Co-authored-by: Erik Bjäreholt <erik@bjareho.lt>
    Co-authored-by: Parv Agarwal <65726543+Parvfect@users.noreply.github.com>
    Co-authored-by: Parvfect <parvagrw02@gmail.com>
    Co-authored-by: Ben Pettit <pelleter@gmail.com>
    
    * update dependencies - seaborn
    
    * docs/perf: reduced the imports: `cueing` example
    
    * bug: update deprecated `plot_psd()` method
    
    - feature of new `mne` version.
    - instead of doing plot_psd() from the `mne.io.Raw` object, must do this:
    	- `raw.compute_psd().plot()`
    	- i.e., has to pass through a `spectrum` object
    
    * updated deprec. `mne` function
    
    * perf: removed importage of unused packages from example
    - One of them, i.e., `collections.Iterable` is even deprecated.
    - Must use `collections.abc.Iterable` instead now.
    - Resulting in faster build/user run
    
    * bugfix: `plot_conditions` - due to `sns` deprecation
    
    * bugfix: resolved `psd_welch()` deprecation (`mne`)
    
    ---------
    
    Co-authored-by: John Griffiths <JohnGriffiths@users.noreply.github.com>
    Co-authored-by: Erik Bjäreholt <erik@bjareho.lt>
    Co-authored-by: Parv Agarwal <65726543+Parvfect@users.noreply.github.com>
    Co-authored-by: Parvfect <parvagrw02@gmail.com>
    Co-authored-by: Ben Pettit <pelleter@gmail.com>
    Co-authored-by: Taha Morshedzadeh <taha.morshedzadeh@neuromatch.io>
    7 people authored Mar 4, 2023
    Configuration menu
    Copy the full SHA
    584272e View commit details
    Browse the repository at this point in the history
  2. Updated psychopy (#215)

    * update psychopy for psychxr compatibility
    
    * updated n170 example to run again.
    pellet authored Mar 4, 2023
    Configuration menu
    Copy the full SHA
    d0715cf View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c9b6671 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2023

  1. Updated doc examples for N170, P300 and SSVEP after Experiment Class …

    …Refactor (#218)
    
    * major update: merging develop to master (#217)
    
    * example test commit (#182)
    
    * example test commit
    
    * example edit
    
    * ci: run test workflow on develop branch
    
    * ci: add develop branch to job triggers
    
    * ci: fix syntax issue in workflow
    
    * fix: fixed import (brainflow updated API)
    
    * build(deps): locked pylsl==1.10.5 (#187)
    
    * Experiment Class Refactor (update to #183), converting specific experiments to subclasses (#184)
    
    * First commit
    
    * Second commit
    
    * Modifications
    
    * Lol
    
    * Lol
    
    * Incorporated N170 and p300, looking good for a PR
    
    * ssvep update
    
    * Implementing subclasses instead of loose functions
    
    * fix: fixed import (brainflow updated API)
    
    * Playing around still
    
    * Fixing import errors
    
    * Adding abstractmethod decorators
    
    * Still working on the import error
    
    * Guess what's finally working
    
    * Comments and naming ticks
    
    * More comments
    
    * Live coding demonstration
    
    * ssvep adapted
    
    * Adapting Auditory Oddball
    
    * changing save_fn to self.save_fun
    
    * This maybe the last big change
    
    * utils file changed, changes work through cli
    
    Co-authored-by: Erik Bjäreholt <erik@bjareho.lt>
    
    * Submodule added for gsoc
    
    * Adding pipelines for cli analysis (#202)
    
    * started pipelines function
    
    * almost working simple function equivalents of nb scripts
    
    * fix: fixed import (brainflow updated API)
    
    * sqc fixes for unicorn (#176)
    
    * Ignore pushes
    
    * Trying to create a cli
    
    * Stepping through the problem
    
    * First commit
    
    * Fixing pause in signal quality check
    
    * Fixing Signal quality check problem
    
    * fix the technical debt
    
    * Save path done for automated saving pdf
    
    * I feel amazing
    
    * Almost through
    
    * Update eegnb/cli/__main__.py
    
    Co-authored-by: Erik Bjäreholt <erik@bjareho.lt>
    
    * Trying to create cli but it's being really painful
    
    * Extra word cli error
    
    * Changed example handling
    
    * Pain
    
    * Adding whole datapath
    
    * Finally fixed cli
    
    * hmm
    
    * Looking good
    
    * added hyperlink
    
    * Having some issues with detecting css and image deltetion
    
    * Just the css now
    
    * Fixed the css linking problem though it's a weird soln
    
    * Automated running, still fnames problem
    
    * Hahahah embedded images in html
    
    * Improving code
    
    * Okay now
    
    * Look at that
    
    * Almost there just the two figures now
    
    * Now
    
    * Added attrdict to do with cli error
    
    Co-authored-by: John Griffiths <j.davidgriffiths@gmail.com>
    Co-authored-by: Erik Bjäreholt <erik@bjareho.lt>
    Co-authored-by: John Griffiths <JohnGriffiths@users.noreply.github.com>
    
    * added more options for site args; improved function names; removed some redundant lines (#209)
    
    * fix subject num parsing bug
    
    * analysis report function improvements for openbci cyton and gtec unicorn devices
    
    * run exp fix
    
    * Update requirements.txt
    
    * fixes to get docs building by github action (#210)
    
    * fixes to get docs building by github action
    
    * reverted some changes
    
    * Update 01r__ssvep_viz.py
    
    Co-authored-by: John Griffiths <JohnGriffiths@users.noreply.github.com>
    
    * Update README.rst
    
    small commit to test doc build workflow on this branch
    
    * removing gsoc submodule
    
    Co-authored-by: Erik Bjäreholt <erik@bjareho.lt>
    Co-authored-by: Parv Agarwal <65726543+Parvfect@users.noreply.github.com>
    Co-authored-by: Parvfect <parvagrw02@gmail.com>
    Co-authored-by: Ben Pettit <pelleter@gmail.com>
    
    * Updated doc examples
    
    * Update 00x__n170_run_experiment.py
    
    fix: typo in func param
    
    ---------
    
    Co-authored-by: John Griffiths <JohnGriffiths@users.noreply.github.com>
    Co-authored-by: Erik Bjäreholt <erik@bjareho.lt>
    Co-authored-by: Ben Pettit <pelleter@gmail.com>
    Co-authored-by: Ore O <oreogundipe@gmail.com>
    5 people authored Mar 10, 2023
    Configuration menu
    Copy the full SHA
    53154c2 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2023

  1. Merge pull request #222 from NeuroTechX/dev/update-wxpython

    ci: update Python to 3.8, update wxPython
    ErikBjare authored Mar 11, 2023
    Configuration menu
    Copy the full SHA
    70758b7 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c24b7c7 View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2023

  1. Configuration menu
    Copy the full SHA
    81dd244 View commit details
    Browse the repository at this point in the history
  2. Get CI test builds working again! (#170)

    * Revert "Revert PR #167: "ci: fix broken CI" (#169)"
    
    This reverts commit 2d74871.
    
    * Update Makefile
    
    * fix: Update vep.py import
    
    * Update Makefile
    
    * Update vep.py
    
    * fix: typo in makefile
    
    * fix: update BaseExperiment class reference
    
    * Update Makefile
    
    * Update vep.py
    
    * Update 01r__n170_viz.py
    
    * makefile: install libnotify4
    
    ---------
    
    Co-authored-by: Ore O <oreogundipe@gmail.com>
    ErikBjare and oreHGA authored Apr 27, 2023
    Configuration menu
    Copy the full SHA
    7be54d6 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2023

  1. Configuration menu
    Copy the full SHA
    9d61617 View commit details
    Browse the repository at this point in the history
  2. fix macos build (#245)

    pellet authored Nov 16, 2023
    Configuration menu
    Copy the full SHA
    a4bec9b View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2023

  1. Configuration menu
    Copy the full SHA
    d8b5976 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2023

  1. Configuration menu
    Copy the full SHA
    7cf7774 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2024

  1. Fix plot conditions (#257)

    * fixed plot_conditions functoni issues
    
    * small change to viz n170 plotting example
    
    * small change to viz p300 plotting example
    
    * fixed to plotting issue
    
    * modify plot command
    
    * update example files
    
    * fix condition label bug
    
    * fix: set layout engine to fix colorbar error
    
    ---------
    
    Co-authored-by: Ore O <oreogundipe@gmail.com>
    JohnGriffiths and oreHGA authored Mar 7, 2024
    Configuration menu
    Copy the full SHA
    d00c2dd View commit details
    Browse the repository at this point in the history
  2. Started the name switch (#251)

    * started renaming from eegnb to eegexpy
    
    * more eegnb renaming work
    
    * more eegnb switches
    
    * more relabelling
    
    * ssvep renamings
    
    * cueing eg
    
    * update for more misc files
    
    * more of the same
    
    * update
    
    * Update and rename available_notebooks.md to available_experiments.md
    JohnGriffiths authored Mar 7, 2024
    Configuration menu
    Copy the full SHA
    1587cbb View commit details
    Browse the repository at this point in the history
  3. Add newlogo (#260)

    * Add files via upload
    
    * Update README.rst
    JohnGriffiths authored Mar 7, 2024
    Configuration menu
    Copy the full SHA
    0e1ecc1 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    5099b97 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2024

  1. Configuration menu
    Copy the full SHA
    297926c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8421b6c View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2024

  1. Add multiple installation options (#263)

    * added newly separated analysis and streaming utils files
    
    * modified setup and requirements to allow for optional install types
    
    * updated imports in experiment examples
    
    * fixed some typos
    
    * Update requirements.txt
    
    moved click library to stim pres requirements section
    
    * Update requirements.txt
    
    Co-authored-by: Taha Morshedzadeh <t.morshedzadeh@mail.utoronto.ca>
    
    * Update Makefile
    
    * Update docs.yml
    
    * Update Makefile
    
    this does a full build with all dependencies for EEG-ExPy
    
    ---------
    
    Co-authored-by: Ore O <oreogundipe@gmail.com>
    Co-authored-by: Taha Morshedzadeh <t.morshedzadeh@mail.utoronto.ca>
    3 people authored Jun 16, 2024
    Configuration menu
    Copy the full SHA
    5bbca2b View commit details
    Browse the repository at this point in the history
  2. Add support for /develop in docs site (#259)

    * feat: update action to build doc page in a folder
    
    * test: see if it works without if clause
    
    * test: change source for docs
    oreHGA authored Jun 16, 2024
    Configuration menu
    Copy the full SHA
    21a09ab View commit details
    Browse the repository at this point in the history
  3. Initial support for VR headsets (#241)

    * fixed requirements.txt so 'pip install -e .' would work on windows.
    
    * added support for n170 to run on rift
    
    * altered logic to add back in jitter
    
    * simplified logic
    
    * made fullscreen again
    
    * further simplified logic
    
    * decreased font size of instructions for vr
    
    * fixed instructions display, further simplified logic, removed logs
    
    * made code easier to read
    
    * reverted board back to muse
    
    * Enable headlocking to fix jittering - cancel out any rotation and translation coming from the headset.
    
    * fixed use_vr parameter to be set to False by default for existing experiments.
    
    * fix macos build
    
    * reverted unnecessary changes and made p300 experiment display correctly
    
    * added vr support for p300 and ssvep
    
    * fix psychxr version
    
    * adding vr doc
    
    * updated vr doco
    
    ---------
    
    Co-authored-by: John Griffiths <JohnGriffiths@users.noreply.github.com>
    pellet and JohnGriffiths authored Jun 16, 2024
    Configuration menu
    Copy the full SHA
    fad804b View commit details
    Browse the repository at this point in the history
  4. ssaep volumefadingfixes (#81)

    * fixed duration on instructions screen
    
    * put sound object instantiation inside trials loop. fixes sound fading issue
    JohnGriffiths authored Jun 16, 2024
    Configuration menu
    Copy the full SHA
    e902b73 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2024

  1. Configuration menu
    Copy the full SHA
    cd08c42 View commit details
    Browse the repository at this point in the history