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.

Sign up for GitHub

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

Jump to bottom

Chang to merge #76

Merged
merged 56 commits into from
Apr 28, 2020
Merged

Chang to merge #76

merged 56 commits into from
Apr 28, 2020

Commits on Aug 22, 2019

  1. small bug fixes

    @jgmakin
    jgmakin committed Aug 22, 2019
    Configuration menu
    Copy the full SHA
    9d9a0f3 View commit details
    Browse the repository at this point in the history

  2. small changes for PEP compliance

    @jgmakin
    jgmakin committed Aug 22, 2019
    Configuration menu
    Copy the full SHA
    3c792be View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2019

  1. added method for computing and storing bipolar-referenced electrodes

    @jgmakin
    jgmakin committed Aug 24, 2019
    Configuration menu
    Copy the full SHA
    b86cbe3 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2019

  1. -bipolar referencing 

    -bug fixes
-numerous changes for PEP compliance
    @jgmakin
    jgmakin committed Aug 28, 2019
    Configuration menu
    Copy the full SHA
    7b698f7 View commit details
    Browse the repository at this point in the history

  2. resolved merge conflict (trivial); modified mwb_copy_file for use wit… 

    …h bipolar electrodes
    @jgmakin
    jgmakin committed Aug 28, 2019
    Configuration menu
    Copy the full SHA
    ae93b1f View commit details
    Browse the repository at this point in the history

  3. added ability to save bipolar data and compute its high-gamma component

    @jgmakin
    jgmakin committed Aug 28, 2019
    Configuration menu
    Copy the full SHA
    32b0cca View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2019

  1. minor fixes

    @jgmakin
    jgmakin committed Sep 4, 2019
    Configuration menu
    Copy the full SHA
    4e3415c View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2019

  1. minor changes

    @jgmakin
    jgmakin committed Sep 18, 2019
    Configuration menu
    Copy the full SHA
    dbaa941 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2019

  1. added option to subsampled the grid before computing bipolar reference

    @jgmakin
    jgmakin committed Oct 10, 2019
    Configuration menu
    Copy the full SHA
    587e267 View commit details
    Browse the repository at this point in the history

  2. bug fix

    @jgmakin
    jgmakin committed Oct 10, 2019
    Configuration menu
    Copy the full SHA
    5e4a529 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2019

  1. renamed vars

    @jgmakin
    jgmakin committed Oct 11, 2019
    Configuration menu
    Copy the full SHA
    ea04d35 View commit details
    Browse the repository at this point in the history

  2. rationalized

    @jgmakin
    jgmakin committed Oct 11, 2019
    Configuration menu
    Copy the full SHA
    5bf6d1c View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2019

  1. updated name of repo

    @jessierliu
    jessierliu committed Oct 12, 2019
    Configuration menu
    Copy the full SHA
    8ba98d1 View commit details
    Browse the repository at this point in the history

  2. update with specific versions of pynwb and hdmf. there were some upda… 

    …tes that break the code at the current moment
    @jessierliu
    jessierliu committed Oct 12, 2019
    Configuration menu
    Copy the full SHA
    028f691 View commit details
    Browse the repository at this point in the history

  3. specify package versions for hdmf and pynwb

    @jessierliu
    jessierliu committed Oct 12, 2019
    Configuration menu
    Copy the full SHA
    d2eff45 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2019

  1. Update README.md

    @jessierliu
    jessierliu committed Oct 15, 2019
    Configuration menu
    Copy the full SHA
    7bd66ba View commit details
    Browse the repository at this point in the history

  2. add nwbext_ecog version to setup

    @jessierliu
    jessierliu committed Oct 15, 2019
    Configuration menu
    Copy the full SHA
    94cbfb8 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2019

  1. updated ignore

    @jessierliu
    jessierliu committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    6f9b47f View commit details
    Browse the repository at this point in the history

  2. add ignoring microphone sounds before the start sound. this still nee… 

    …ds improvement though
    @jessierliu
    jessierliu committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    b31de3b View commit details
    Browse the repository at this point in the history

  3. update the copy objectives

    @jessierliu
    jessierliu committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    4c620d7 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2019

  1. restored default settings for bipolar referencing

    @jgmakin
    jgmakin committed Oct 25, 2019
    Configuration menu
    Copy the full SHA
    a49c37f View commit details
    Browse the repository at this point in the history

  2. -bug fix (electrodes unassigned in certain cases)

    @jgmakin
    jgmakin committed Oct 25, 2019
    Configuration menu
    Copy the full SHA
    7876f88 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2019

  1. Merge branch 'master' of https://github.com/jgmakin/ecogVIS

    @jgmakin
    jgmakin committed Oct 26, 2019
    Configuration menu
    Copy the full SHA
    b75754f View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2019

  1. Adding smoothed signals and thresholds to event detection GUI after c… 

    …licking "Run Test"
    @emilyps14
    emilyps14 committed Oct 27, 2019
    Configuration menu
    Copy the full SHA
    f26987c View commit details
    Browse the repository at this point in the history

  2. Improving the scaling and colors on the smoothed signals and thresholds

    @emilyps14
    emilyps14 committed Oct 27, 2019
    Configuration menu
    Copy the full SHA
    51227e5 View commit details
    Browse the repository at this point in the history

  3. Allow the user to specify start and stop time for "whole signal" even… 

    …t detection
    @emilyps14
    emilyps14 committed Oct 27, 2019
    Configuration menu
    Copy the full SHA
    3d775ff View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2019

  1. Changing usage of the FS_colorLUT so that it will default to "unknown… 

    …" if the key doesn't exist
    @emilyps14
    emilyps14 committed Oct 28, 2019
    Configuration menu
    Copy the full SHA
    268c1b5 View commit details
    Browse the repository at this point in the history

  2. Changing background color to white for unknown (when black it interfe… 

    …res with confidence intervals)
    @emilyps14
    emilyps14 committed Oct 28, 2019
    Configuration menu
    Copy the full SHA
    69782ce View commit details
    Browse the repository at this point in the history

  3. In main application, plot the Speaker and Mic intervals if they exist

    @emilyps14
    emilyps14 committed Oct 28, 2019
    Configuration menu
    Copy the full SHA
    0e83d76 View commit details
    Browse the repository at this point in the history

  4. Updating the main window to show speaker and mic intervals after runn… 

    …ing the event detection gui
    @emilyps14
    emilyps14 committed Oct 28, 2019
    Configuration menu
    Copy the full SHA
    a929792 View commit details
    Browse the repository at this point in the history

  5. Fix bug where ERPs with one row fill the height of the window

    @emilyps14
    emilyps14 committed Oct 28, 2019
    Configuration menu
    Copy the full SHA
    73bc318 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2019

  1. Merge pull request #3 from jgmakin/event_detection 

    Event detection
    @jessierliu
    jessierliu committed Nov 7, 2019
    Configuration menu
    Copy the full SHA
    7753f10 View commit details
    Browse the repository at this point in the history

  2. better visualization of separate signals

    @jessierliu
    jessierliu committed Nov 7, 2019
    Configuration menu
    Copy the full SHA
    08b574a View commit details
    Browse the repository at this point in the history

  3. fix the mic and speaker thresholds to act on [-1, 1] normalized signals

    @jessierliu
    jessierliu committed Nov 7, 2019
    Configuration menu
    Copy the full SHA
    415d569 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2019

  1. change test to run on the whole signal as determined by the range spe… 

    …cified at the bottom
    @jessierliu
    jessierliu committed Nov 8, 2019
    Configuration menu
    Copy the full SHA
    e56d1fb View commit details
    Browse the repository at this point in the history

  2. ensures that only full events are detected, they must have a start an… 

    …d a stop. additionally gets rid of events that last for less than 100 ms
    @jessierliu
    jessierliu committed Nov 8, 2019
    Configuration menu
    Copy the full SHA
    063d282 View commit details
    Browse the repository at this point in the history

  3. changed color scheme to be a little clearer

    @jessierliu
    jessierliu committed Nov 8, 2019
    Configuration menu
    Copy the full SHA
    bd60302 View commit details
    Browse the repository at this point in the history

  4. fix autoscaling of stimulus plot in the main window

    @jessierliu
    jessierliu committed Nov 8, 2019
    Configuration menu
    Copy the full SHA
    131b01f View commit details
    Browse the repository at this point in the history

  5. Decouple plotting from detect events, represent all times in relative… 

    … to the original start time
    @emilyps14
    emilyps14 committed Nov 8, 2019
    Configuration menu
    Copy the full SHA
    3c88672 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2019

  1. Reorganize detection controls

    @emilyps14
    emilyps14 committed Nov 9, 2019
    Configuration menu
    Copy the full SHA
    d389e7a View commit details
    Browse the repository at this point in the history

  2. Adding slider controls

    @emilyps14
    emilyps14 committed Nov 9, 2019
    Configuration menu
    Copy the full SHA
    dede52c View commit details
    Browse the repository at this point in the history

  3. changes to improve panel vis

    @jessierliu
    jessierliu committed Nov 9, 2019
    Configuration menu
    Copy the full SHA
    1951b49 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #5 from jgmakin/event_detection 

    Event detection
    @jessierliu
    jessierliu committed Nov 9, 2019
    Configuration menu
    Copy the full SHA
    04fe0eb View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2019

  1. fix issue with button naming for event detection

    @jessierliu
    jessierliu committed Nov 20, 2019
    Configuration menu
    Copy the full SHA
    8357c8a View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2019

  1. fix definitions in electrode table to be strings and not any sort of … 

    …numpy object, this needed to be changed with update of pynwb to 1.1.2
    @jessierliu
    jessierliu committed Dec 7, 2019
    Configuration menu
    Copy the full SHA
    e258df1 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #10 from jgmakin/version_edit 

    fix definitions in electrode table to be strings and not any sort of …
    @jessierliu
    jessierliu committed Dec 7, 2019
    Configuration menu
    Copy the full SHA
    f629cf6 View commit details
    Browse the repository at this point in the history

  3. fix version requirements

    @jessierliu
    jessierliu committed Dec 7, 2019
    Configuration menu
    Copy the full SHA
    b8d7215 View commit details
    Browse the repository at this point in the history

  4. re-add nwbext_ecog

    @jessierliu
    jessierliu committed Dec 7, 2019
    Configuration menu
    Copy the full SHA
    94ea3ca View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2020

  1. seq -> tuple(seq) for compliance with newer versions of numpy

    @jgmakin
    jgmakin committed Mar 5, 2020
    Configuration menu
    Copy the full SHA
    a3aeba0 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2020

  1. Merge remote-tracking branch 'jgmakin/master' 

    # Conflicts:
#	README.md
#	ecogvis/functions/misc_dialogs.py
#	ecogvis/functions/nwb_copy_file.py
#	ecogvis/functions/subFunctions.py
#	ecogvis/signal_processing/detect_events.py
#	ecogvis/signal_processing/processing_data.py
#	ecogvis/signal_processing/resample_clone.py
#	setup.py
    @bendichter
    bendichter committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    9d8a49c View commit details
    Browse the repository at this point in the history

  2. fix extra LFP term

    @bendichter
    bendichter committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    8cbcf2e View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2020

  1. fix NameError: name 'interfaces' is not defined

    @luiztauffer
    luiztauffer committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    7ec0f7c View commit details
    Browse the repository at this point in the history

  2. fix test_detect_events errors (partially)

    @luiztauffer
    luiztauffer committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    5e6a631 View commit details
    Browse the repository at this point in the history

  3. small alignment and linter fixes

    @luiztauffer
    luiztauffer committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    035123f View commit details
    Browse the repository at this point in the history

  4. alignment and linter fixes

    @luiztauffer
    luiztauffer committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    480ca49 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2020

  1. - fix test detect events 

    - add example mic and speaker data for test
    @luiztauffer
    luiztauffer committed Apr 28, 2020
    Configuration menu
    Copy the full SHA
    4de089b View commit details
    Browse the repository at this point in the history