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

Chang to merge #76

Merged
merged 56 commits into from
Apr 28, 2020
Merged
Show file tree
Hide file tree
Changes from 55 commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
9d9a0f3
small bug fixes
jgmakin Aug 22, 2019
3c792be
small changes for PEP compliance
jgmakin Aug 22, 2019
b86cbe3
added method for computing and storing bipolar-referenced electrodes
jgmakin Aug 24, 2019
7b698f7
-bipolar referencing
jgmakin Aug 28, 2019
ae93b1f
resolved merge conflict (trivial); modified mwb_copy_file for use wit…
jgmakin Aug 28, 2019
32b0cca
added ability to save bipolar data and compute its high-gamma component
jgmakin Aug 28, 2019
4e3415c
minor fixes
jgmakin Sep 4, 2019
dbaa941
minor changes
jgmakin Sep 18, 2019
587e267
added option to subsampled the grid before computing bipolar reference
jgmakin Oct 10, 2019
5e4a529
bug fix
jgmakin Oct 10, 2019
ea04d35
renamed vars
jgmakin Oct 11, 2019
5bf6d1c
rationalized
jgmakin Oct 11, 2019
8ba98d1
updated name of repo
jessierliu Oct 12, 2019
028f691
update with specific versions of pynwb and hdmf. there were some upda…
jessierliu Oct 12, 2019
d2eff45
specify package versions for hdmf and pynwb
jessierliu Oct 12, 2019
7bd66ba
Update README.md
jessierliu Oct 15, 2019
94cbfb8
add nwbext_ecog version to setup
jessierliu Oct 15, 2019
6f9b47f
updated ignore
jessierliu Oct 16, 2019
b31de3b
add ignoring microphone sounds before the start sound. this still nee…
jessierliu Oct 16, 2019
4c620d7
update the copy objectives
jessierliu Oct 16, 2019
a49c37f
restored default settings for bipolar referencing
jgmakin Oct 25, 2019
7876f88
-bug fix (electrodes unassigned in certain cases)
jgmakin Oct 25, 2019
b75754f
Merge branch 'master' of https://github.com/jgmakin/ecogVIS
jgmakin Oct 26, 2019
f26987c
Adding smoothed signals and thresholds to event detection GUI after c…
emilyps14 Oct 27, 2019
51227e5
Improving the scaling and colors on the smoothed signals and thresholds
emilyps14 Oct 27, 2019
3d775ff
Allow the user to specify start and stop time for "whole signal" even…
emilyps14 Oct 27, 2019
268c1b5
Changing usage of the FS_colorLUT so that it will default to "unknown…
emilyps14 Oct 28, 2019
69782ce
Changing background color to white for unknown (when black it interfe…
emilyps14 Oct 28, 2019
0e83d76
In main application, plot the Speaker and Mic intervals if they exist
emilyps14 Oct 28, 2019
a929792
Updating the main window to show speaker and mic intervals after runn…
emilyps14 Oct 28, 2019
73bc318
Fix bug where ERPs with one row fill the height of the window
emilyps14 Oct 28, 2019
7753f10
Merge pull request #3 from jgmakin/event_detection
jessierliu Nov 7, 2019
08b574a
better visualization of separate signals
jessierliu Nov 7, 2019
415d569
fix the mic and speaker thresholds to act on [-1, 1] normalized signals
jessierliu Nov 7, 2019
e56d1fb
change test to run on the whole signal as determined by the range spe…
jessierliu Nov 8, 2019
063d282
ensures that only full events are detected, they must have a start an…
jessierliu Nov 8, 2019
bd60302
changed color scheme to be a little clearer
jessierliu Nov 8, 2019
131b01f
fix autoscaling of stimulus plot in the main window
jessierliu Nov 8, 2019
3c88672
Decouple plotting from detect events, represent all times in relative…
emilyps14 Nov 8, 2019
d389e7a
Reorganize detection controls
emilyps14 Nov 9, 2019
dede52c
Adding slider controls
emilyps14 Nov 9, 2019
1951b49
changes to improve panel vis
jessierliu Nov 9, 2019
04fe0eb
Merge pull request #5 from jgmakin/event_detection
jessierliu Nov 9, 2019
8357c8a
fix issue with button naming for event detection
jessierliu Nov 20, 2019
e258df1
fix definitions in electrode table to be strings and not any sort of …
jessierliu Dec 7, 2019
f629cf6
Merge pull request #10 from jgmakin/version_edit
jessierliu Dec 7, 2019
b8d7215
fix version requirements
jessierliu Dec 7, 2019
94ea3ca
re-add nwbext_ecog
jessierliu Dec 7, 2019
a3aeba0
seq -> tuple(seq) for compliance with newer versions of numpy
jgmakin Mar 5, 2020
9d8a49c
Merge remote-tracking branch 'jgmakin/master'
bendichter Apr 15, 2020
8cbcf2e
fix extra LFP term
bendichter Apr 15, 2020
7ec0f7c
fix NameError: name 'interfaces' is not defined
luiztauffer Apr 17, 2020
5e6a631
fix test_detect_events errors (partially)
luiztauffer Apr 17, 2020
035123f
small alignment and linter fixes
luiztauffer Apr 17, 2020
480ca49
alignment and linter fixes
luiztauffer Apr 17, 2020
4de089b
- fix test detect events
luiztauffer Apr 28, 2020
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Pycharm
.idea/

# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# ecogVIS
Timeseries visualizer and data processing tools for Electrocorticography (ECoG) signals stored in [NWB](https://neurodatawithoutborders.github.io/) files, for Python.

A collaboration with the [Chang Lab](http://changlab.ucsf.edu/).
[![codecov](https://codecov.io/gh/ben-dichter-consulting/ecogVIS/branch/master/graph/badge.svg)](https://codecov.io/gh/ben-dichter-consulting/ecogVIS)


Expand Down
18 changes: 9 additions & 9 deletions ecogvis/functions/FS_colorLUT.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
def get_lut():
cmap = {'Unknown': [ 0., 0., 0.],
cmap = {'Unknown': [ 255., 255., 255.],
'Left-Cerebral-Exterior': [70., 130., 180.],
'Left-Cerebral-White-Matter': [245., 245., 245.],
'Left-Cerebral-Cortex': [205., 62., 78.],
Expand Down Expand Up @@ -515,7 +515,7 @@ def get_lut():
'wm-rh-temporalpole': [185., 185., 185.],
'wm-rh-transversetemporal': [105., 105., 55.],
'wm-rh-insula': [254., 191., 31.],
'ctx-lh-Unknown': [0., 0., 0.],
'ctx-lh-Unknown': [255., 255., 255.],
'ctx-lh-Corpus_callosum': [50., 50., 50.],
'ctx-lh-G_and_S_Insula_ONLY_AVERAGE': [180., 20., 30.],
'ctx-lh-G_cingulate-Isthmus': [60., 25., 25.],
Expand Down Expand Up @@ -606,7 +606,7 @@ def get_lut():
'ctx-lh-S_temporal_inferior': [21., 180., 180.],
'ctx-lh-S_temporal_superior': [223., 220., 60.],
'ctx-lh-S_temporal_transverse': [221., 60., 60.],
'ctx-rh-Unknown': [0., 0., 0.],
'ctx-rh-Unknown': [255., 255., 255.],
'ctx-rh-Corpus_callosum': [50., 50., 50.],
'ctx-rh-G_and_S_Insula_ONLY_AVERAGE': [180., 20., 30.],
'ctx-rh-G_cingulate-Isthmus': [60., 25., 25.],
Expand Down Expand Up @@ -697,7 +697,7 @@ def get_lut():
'ctx-rh-S_pericallosal-caudal': [25., 150., 90.],
'ctx-rh-S_pericallosal-rostral': [25., 180., 90.],
'ctx-rh-S_pericallosal-posterior': [25., 210., 90.],
'wm-lh-Unknown': [0., 0., 0.],
'wm-lh-Unknown': [255., 255., 255.],
'wm-lh-Corpus_callosum': [50., 50., 50.],
'wm-lh-G_and_S_Insula_ONLY_AVERAGE': [180., 20., 30.],
'wm-lh-G_cingulate-Isthmus': [60., 25., 25.],
Expand Down Expand Up @@ -779,7 +779,7 @@ def get_lut():
'wm-lh-S_temporal_inferior': [21., 180., 180.],
'wm-lh-S_temporal_superior': [223., 220., 60.],
'wm-lh-S_temporal_transverse': [221., 60., 60.],
'wm-rh-Unknown': [0., 0., 0.],
'wm-rh-Unknown': [255., 255., 255.],
'wm-rh-Corpus_callosum': [50., 50., 50.],
'wm-rh-G_and_S_Insula_ONLY_AVERAGE': [180., 20., 30.],
'wm-rh-G_cingulate-Isthmus': [60., 25., 25.],
Expand Down Expand Up @@ -961,7 +961,7 @@ def get_lut():
'ctx-rh-posterior-parietal': [125., 120., 55.],
'ctx-rh-prim-sec-somatosensory': [225., 70., 105.],
'ctx-rh-occipital': [225., 70., 15.],
'ctx_lh_Unknown': [0., 0., 0.],
'ctx_lh_Unknown': [255., 255., 255.],
'ctx_lh_G_and_S_frontomargin': [23., 220., 60.],
'ctx_lh_G_and_S_occipital_inf': [23., 60., 180.],
'ctx_lh_G_and_S_paracentral': [63., 100., 60.],
Expand Down Expand Up @@ -1037,7 +1037,7 @@ def get_lut():
'ctx_lh_S_temporal_inf': [21., 180., 180.],
'ctx_lh_S_temporal_sup': [223., 220., 60.],
'ctx_lh_S_temporal_transverse': [221., 60., 60.],
'ctx_rh_Unknown': [0., 0., 0.],
'ctx_rh_Unknown': [255., 255., 255.],
'ctx_rh_G_and_S_frontomargin': [23., 220., 60.],
'ctx_rh_G_and_S_occipital_inf': [23., 60., 180.],
'ctx_rh_G_and_S_paracentral': [63., 100., 60.],
Expand Down Expand Up @@ -1113,7 +1113,7 @@ def get_lut():
'ctx_rh_S_temporal_inf': [21., 180., 180.],
'ctx_rh_S_temporal_sup': [223., 220., 60.],
'ctx_rh_S_temporal_transverse': [221., 60., 60.],
'wm_lh_Unknown': [0., 0., 0.],
'wm_lh_Unknown': [255., 255., 255.],
'wm_lh_G_and_S_frontomargin': [23., 220., 60.],
'wm_lh_G_and_S_occipital_inf': [23., 60., 180.],
'wm_lh_G_and_S_paracentral': [63., 100., 60.],
Expand Down Expand Up @@ -1189,7 +1189,7 @@ def get_lut():
'wm_lh_S_temporal_inf': [21., 180., 180.],
'wm_lh_S_temporal_sup': [223., 220., 60.],
'wm_lh_S_temporal_transverse': [221., 60., 60.],
'wm_rh_Unknown': [0., 0., 0.],
'wm_rh_Unknown': [255., 255., 255.],
'wm_rh_G_and_S_frontomargin': [23., 220., 60.],
'wm_rh_G_and_S_occipital_inf': [23., 60., 180.],
'wm_rh_G_and_S_paracentral': [63., 100., 60.],
Expand Down
Loading